Merge branch 'javascript'

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

t/clang_format_spec.vim

@@ -29,9 +29,10 @@ function! GetBuffer()
     return join(getline(1, '$'), "\n")
 endfunction
 
-function! ClangFormat(line1, line2)
+function! ClangFormat(line1, line2, ...)
     let opt = printf(" -lines=%d:%d -style='{BasedOnStyle: Google, IndentWidth: %d, UseTab: %s}' ", a:line1, a:line2, &l:shiftwidth, &l:expandtab==1 ? "false" : "true")
-    let cmd = g:clang_format#command.opt.'./'.s:root_dir.'t/test.cpp --'
+    let file = a:0 == 0 ? 'test.cpp' : a:1
+    let cmd = g:clang_format#command.opt.'./'.s:root_dir.'t/' . file . ' --'
     return Chomp(system(cmd))
 endfunction
 "}}}
@@ -77,13 +78,15 @@ describe 'default settings'
         Expect exists('g:clang_format#extra_args') to_be_true
         Expect exists('g:clang_format#code_style') to_be_true
         Expect exists('g:clang_format#style_options') to_be_true
+        Expect exists('g:clang_format#filetype_style_options') to_be_true
         Expect exists('g:clang_format#command') to_be_true
         Expect exists('g:clang_format#detect_style_file') to_be_true
         Expect exists('g:clang_format#auto_format') to_be_true
         Expect exists('g:clang_format#auto_format_on_insert_leave') to_be_true
         Expect g:clang_format#extra_args to_be_empty
         Expect g:clang_format#code_style ==# 'google'
         Expect g:clang_format#style_options to_be_empty
+        Expect g:clang_format#filetype_style_options to_be_empty
         Expect executable(g:clang_format#command) to_be_true
         Expect g:clang_format#detect_style_file to_be_true
     end
@@ -213,41 +216,65 @@ end
 " test for :ClangFormat {{{
 describe ':ClangFormat'
 
-    before
-        let g:clang_format#detect_style_file = 0
-        new
-        execute 'silent' 'edit!' './'.s:root_dir.'t/test.cpp'
-    end
-
-    after
-        bdelete!
-    end
-
-    it 'formats the whole code in normal mode'
-        let by_clang_format_command = ClangFormat(1, line('$'))
-        ClangFormat
-        let buffer = GetBuffer()
-        Expect by_clang_format_command ==# buffer
-    end
+    describe 'with filetype cpp'
+
+        before
+            let g:clang_format#detect_style_file = 0
+            new
+            execute 'silent' 'edit!' './'.s:root_dir.'t/test.cpp'
+        end
+
+        after
+            bdelete!
+        end
+
+        it 'formats the whole code in normal mode'
+            let by_clang_format_command = ClangFormat(1, line('$'))
+            ClangFormat
+            let buffer = GetBuffer()
+            Expect by_clang_format_command ==# buffer
+        end
+
+        it 'formats selected code in visual mode'
+            " format for statement
+            let by_clang_format_command = ClangFormat(11, 13)
+            " move to for statement block
+            execute 11
+            normal! VjjV
+            '<,'>ClangFormat
+            let buffer = GetBuffer()
+            Expect by_clang_format_command ==# buffer
+        end
+
+        it 'doesn''t move cursor'
+            execute 'normal!' (1+line('$')).'gg'
+            let pos = getpos('.')
+            ClangFormat
+            Expect pos == getpos('.')
+        end
+
+    end
+
+    describe 'with filetype javascript'
+
+        before
+            let g:clang_format#detect_style_file = 0
+            new
+            execute 'silent' 'edit!' './'.s:root_dir.'t/test.js'
+        end
+
+        after
+            bdelete!
+        end
+
+        it 'formats the whole code in normal mode'
+            let by_clang_format_command = ClangFormat(1, line('$'), 'test.js')
+            ClangFormat
+            let buffer = GetBuffer()
+            Expect by_clang_format_command ==# buffer
+        end
 
-    it 'formats selected code in visual mode'
-        " format for statement
-        let by_clang_format_command = ClangFormat(11, 13)
-        " move to for statement block
-        execute 11
-        normal! VjjV
-        '<,'>ClangFormat
-        let buffer = GetBuffer()
-        Expect by_clang_format_command ==# buffer
     end
-
-    it 'doesn''t move cursor'
-        execute 'normal!' (1+line('$')).'gg'
-        let pos = getpos('.')
-        ClangFormat
-        Expect pos == getpos('.')
-    end
-
 end
 " }}}