fix #38: nested YAML configuration

Author: rhysd

autoload/clang_format.vim

@@ -33,6 +33,20 @@ function! s:system(str, ...)
     return output
 endfunction
 
+function! s:create_keyvals(key, val) abort
+    if type(a:val) == type({})
+        return a:key . ': {' . s:stringize_options(a:val) . '}'
+    else
+        return a:key . ': ' . a:val
+    endif
+endfunction
+
+function! s:stringize_options(opts) abort
+    let dict_type = type({})
+    let keyvals = map(items(a:opts), 's:create_keyvals(v:val[0], v:val[1])')
+    return join(keyvals, ',')
+endfunction
+
 function! s:build_extra_options()
     let extra_options = ""
 
@@ -41,9 +55,7 @@ function! s:build_extra_options()
         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
+    let extra_options .= ', ' . s:stringize_options(opts)
 
     return extra_options
 endfunction

t/clang_format_spec.vim

@@ -145,6 +145,39 @@ describe 'clang_format#format()'
         call s:expect_the_same_output(1, line('$'))
         Expect pos == getpos('.')
     end
+
+    it 'formats following g:clang_format#style_options'
+        let saved = [g:clang_format#style_options, &expandtab, &shiftwidth]
+        try
+            set expandtab
+            set shiftwidth=4
+            let g:clang_format#style_options = {'UseTab' : 'false', 'IndentWidth' : 4}
+            call s:expect_the_same_output(1, line('$'))
+        finally
+            let g:clang_format#style_options = saved[0]
+            let &expandtab = saved[1]
+            let &shiftwidth = saved[2]
+        endtry
+    end
+
+    it 'ensures to fix issue #38'
+        let saved = g:clang_format#style_options
+        try
+            let g:clang_format#style_options = {
+                        \ "BraceWrapping" : {
+                        \     "AfterControlStatement" : "true" ,
+                        \     "AfterClass " : "true",
+                        \   },
+                        \ }
+            try
+                call clang_format#format(1, line('$'))
+            catch /^YAML:\d\+:\d\+/
+                " OK
+            endtry
+        finally
+            let g:clang_format#style_options = saved
+        endtry
+    end
 end
 
 describe 'clang_format#replace()'