add g:clang_format#filetype_style_options

Author: rhysd

autoload/clang_format.vim

@@ -33,11 +33,23 @@ function! s:system(str, ...)
     return output
 endfunction
 
-function! s:make_style_options()
+function! s:build_extra_options()
     let extra_options = ""
-    for [key, value] in items(g:clang_format#style_options)
+
+    let opts = copy(g:clang_format#style_options)
+    if has_key(g:clang_format#filetype_style_options, &ft)
+        call extend(opts, g:clang_format#filetype_style_options[&ft])
+    endif
+
+    for [key, value] in items(opts)
         let extra_options .= printf(", %s: %s", key, value)
     endfor
+
+    return extra_options
+endfunction
+
+function! s:make_style_options()
+    let extra_options = s:build_extra_options()
     return printf("'{BasedOnStyle: %s, IndentWidth: %d, UseTab: %s%s}'",
                         \ g:clang_format#code_style,
                         \ (exists('*shiftwidth') ? shiftwidth() : &l:shiftwidth),
@@ -124,6 +136,7 @@ endif
 
 let g:clang_format#code_style = s:getg('clang_format#code_style', 'google')
 let g:clang_format#style_options = s:getg('clang_format#style_options', {})
+let g:clang_format#filetype_style_options = s:getg('clang_format#filetype_style_options', {})
 
 let g:clang_format#detect_style_file = s:getg('clang_format#detect_style_file', 1)
 let g:clang_format#auto_format = s:getg('clang_format#auto_format', 0)

doc/clang-format.txt

@@ -139,6 +139,27 @@ g:clang_format#style_options                      *g:clang_format#style_options*
     CLANG-FORMAT STYLE OPTIONS
     http://clang.llvm.org/docs/ClangFormatStyleOptions.html
 
+g:clang_format#filetype_style_options
+                                         *g:clang_format#filetype_style_options*
+
+    If you want to use language-specific style options, you can use this
+    variable.  This variable is a |Dictionary| and its key is |filetype|.  You
+    can specify the filetype specific style options as a value of the key.
+    The format to specify options is the same as |g:clang_format#style_options|.
+
+    For example, if you want to set "C++11" to "Standard", you can specify it
+    only when the filetype is "cpp" as below:
+>
+    " Your common style options
+    let g:clang_format#style_options = {
+            \ 'AllowShortIfStatementsOnASingleLine' : 'true',
+            \ }
+
+    " Your filetype specific options
+    let g:clang_format#filetype_style_options = {
+                \   'cpp' : {"Standard" : "C++11"},
+                \ }
+<
 g:clang_format#extra_args                            *g:clang_format#extra_args*
 
     Extra arguments for clang-format.  This |String| value is passed to