r235080 - clang-format: add an option for fallback style in vimrc

[Daniel Jasper]

Author: djasper
Date: Thu Apr 16 03:26:37 2015
New Revision: 235080

URL: http://llvm.org/viewvc/llvm-project?rev=235080&view=rev
Log:
clang-format: add an option for fallback style in vimrc

With this patch, clang-format.py will search and use existing .clang-format
file if there is one and fallback to the specific format style if
not. It should cover the projects which don't have .clang-format
files in their source. As the option fallback-style is available in
clang 3.5 or later, it is safe to use.

Patch by "Chilledheart" (http://reviews.llvm.org/D8489).

Modified:
    cfe/trunk/tools/clang-format/clang-format.py

Modified: cfe/trunk/tools/clang-format/clang-format.py
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/clang-format/clang-format.py?rev=235080&r1=235079&r2=235080&view=diff
==============================================================================
--- cfe/trunk/tools/clang-format/clang-format.py (original)
+++ cfe/trunk/tools/clang-format/clang-format.py Thu Apr 16 03:26:37 2015
@@ -34,6 +34,8 @@ if vim.eval('exists("g:clang_format_path
 # a '.clang-format' or '_clang-format' file to indicate the style that should be
 # used.
 style = 'file'
+if vim.eval('exists("g:clang_format_fallback_style")') == "1":
+  fallback_style = vim.eval('g:clang_format_fallback_style')
 
 def main():
   # Get the current text.
@@ -58,6 +60,8 @@ def main():
 
   # Call formatter.
   command = [binary, '-lines', lines, '-style', style, '-cursor', str(cursor)]
+  if fallback_style:
+    command.extend(['-fallback-style', fallback_style])
   if vim.current.buffer.name:
     command.extend(['-assume-filename', vim.current.buffer.name])
   p = subprocess.Popen(command,