From e1a7262bc4fc841b95ee6fb45c1bb0da5cc3f2c1 Mon Sep 17 00:00:00 2001 From: Daniel Jasper Date: Thu, 16 Apr 2015 08:26:37 +0000 Subject: [PATCH] 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). git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@235080 91177308-0d34-0410-b5e6-96231b3b80d8 --- tools/clang-format/clang-format.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/clang-format/clang-format.py b/tools/clang-format/clang-format.py index a79205a6df..b07160eea6 100644 --- a/tools/clang-format/clang-format.py +++ b/tools/clang-format/clang-format.py @@ -34,6 +34,8 @@ if vim.eval('exists("g:clang_format_path")') == "1": # 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, -- 2.50.1