Fix function argument detection for C

Author: AndrewRadev

autoload/sj.vim

@@ -705,7 +705,13 @@ function! sj#LocateBracesOnLine(open, close, ...)
 
   " optional skip parameter
   if a:0 > 0
-    let skip = sj#SkipSyntax(a:1)
+    if type(a:1) == type([])
+      " it's a list of groups, convert it to a skip expression:
+      let skip = sj#SkipSyntax(a:1)
+    else
+      " use the skip expression as-is
+      let skip = a:1
+    endif
   else
     let skip = ''
   endif

autoload/sj/c.vim

@@ -2,18 +2,12 @@
 let s:skip = sj#SkipSyntax(['cComment', 'cCommentL', 'cString', 'cCppString', 'cBlock'])
 
 function! sj#c#SplitFuncall()
-  if sj#SearchUnderCursor('(.\{-})', '', s:skip) <= 0
+  let [from, to] = sj#LocateBracesAroundCursor('(', ')', s:skip)
+  if from < 0 && to < 0
     return 0
   endif
 
-  call sj#PushCursor()
-
-  normal! l
-  let start = col('.')
-  normal! h%h
-  let end = col('.')
-
-  let items = sj#ParseJsonObjectBody(start, end)
+  let items = sj#ParseJsonObjectBody(from + 1, to - 1)
 
   let body = "("
   if sj#settings#Read('c_argument_split_first_newline')
@@ -28,8 +22,6 @@ function! sj#c#SplitFuncall()
     let body .= ")"
   endif
 
-  call sj#PopCursor()
-
   call sj#ReplaceMotion('va(', body)
   return 1
 endfunction

spec/plugin/c_spec.rb

@@ -25,7 +25,7 @@
     assert_file_contents "if (val1 && val2 || val3);"
   end
 
-  specify "function_call" do
+  specify "function call" do
     set_file_contents "myfunction(lots, of, different, parameters)"
 
     vim.search '('
@@ -43,6 +43,24 @@
     assert_file_contents "myfunction(lots, of, different, parameters)"
   end
 
+  specify "nested function call" do
+    set_file_contents "myfunction(other_function(lots, of, different, parameters))"
+
+    vim.search 'lots'
+    split
+
+    assert_file_contents <<~EOF
+      myfunction(other_function(lots,
+            of,
+            different,
+            parameters))
+    EOF
+
+    join
+
+    assert_file_contents "myfunction(other_function(lots, of, different, parameters))"
+  end
+
   specify "ignores strings" do
     set_file_contents "\"myfunction(several, parameters)\""