Change the behavior of the compiler for fucntion args

Author: Luma

autoload/vimlparser.vim

@@ -4971,16 +4971,24 @@ function! s:Compiler.compile_function(node) abort
   let left = self.compile(a:node.left)
   let rlist = map(a:node.rlist, 'self.compile(v:val)')
   let default_args = map(a:node.default_args, 'self.compile(v:val)')
-  if !empty(rlist) && rlist[-1] ==# '...'
-    let rlist[-1] = '. ...'
-  endif
-  if empty(rlist)
-    call self.out('(function (%s)', left)
-  elseif empty(default_args)
-    call self.out('(function (%s (%s))', left, join(rlist, ' '))
-  else
-    call self.out('(function (%s (%s) (%s))', left, join(rlist, ' '), join(default_args, ' '))
+  if !empty(rlist)
+    let remaining = v:false
+    if rlist[-1] ==# '...'
+      call remove(rlist, -1)
+      let remaining = v:true
+    endif
+    for i in range(len(rlist))
+      if i < len(rlist) - len(default_args)
+        let left .= printf(' (%s)', rlist[i])
+      else
+        let left .= printf(' (%s %s)', rlist[i], default_args[i + len(default_args) - len(rlist)])
+      endif
+    endfor
+    if remaining
+      let left .= ' . ...'
+    endif
   endif
+  call self.out('(function (%s)', left)
   call self.incindent('  ')
   call self.compile_body(a:node.body)
   call self.out(')')

js/vimlparser.js

@@ -4475,18 +4475,27 @@ Compiler.prototype.compile_function = function(node) {
     var left = this.compile(node.left);
     var rlist = node.rlist.map((function(vval) { return this.compile(vval); }).bind(this));
     var default_args = node.default_args.map((function(vval) { return this.compile(vval); }).bind(this));
-    if (!viml_empty(rlist) && rlist[rlist.length - 1] == "...") {
-        rlist[rlist.length - 1] = ". ...";
-    }
-    if (viml_empty(rlist)) {
-        this.out("(function (%s)", left);
-    }
-    else if (viml_empty(default_args)) {
-        this.out("(function (%s (%s))", left, viml_join(rlist, " "));
-    }
-    else {
-        this.out("(function (%s (%s) (%s))", left, viml_join(rlist, " "), viml_join(default_args, " "));
+    if (!viml_empty(rlist)) {
+        var remaining = v:false;
+        if (rlist[rlist.length - 1] == "...") {
+            viml_remove(rlist, -1);
+            var remaining = v:true;
+        }
+        var __c11 = viml_range(viml_len(rlist));
+        for (var __i11 = 0; __i11 < __c11.length; ++__i11) {
+            var i = __c11[__i11];
+            if (i < viml_len(rlist) - viml_len(default_args)) {
+                left += viml_printf(" (%s)", rlist[i]);
+            }
+            else {
+                left += viml_printf(" (%s %s)", rlist[i], default_args[i + viml_len(default_args) - viml_len(rlist)]);
+            }
+        }
+        if (remaining) {
+            left += " . ...";
+        }
     }
+    this.out("(function (%s)", left);
     this.incindent("  ");
     this.compile_body(node.body);
     this.out(")");
@@ -4573,9 +4582,9 @@ Compiler.prototype.compile_if = function(node) {
     this.incindent("  ");
     this.compile_body(node.body);
     this.decindent();
-    var __c11 = node.elseif;
-    for (var __i11 = 0; __i11 < __c11.length; ++__i11) {
-        var enode = __c11[__i11];
+    var __c12 = node.elseif;
+    for (var __i12 = 0; __i12 < __c12.length; ++__i12) {
+        var enode = __c12[__i12];
         this.out(" elseif %s", this.compile(enode.cond));
         this.incindent("  ");
         this.compile_body(enode.body);
@@ -4632,9 +4641,9 @@ Compiler.prototype.compile_try = function(node) {
     this.out("(try");
     this.incindent("  ");
     this.compile_body(node.body);
-    var __c12 = node.catch;
-    for (var __i12 = 0; __i12 < __c12.length; ++__i12) {
-        var cnode = __c12[__i12];
+    var __c13 = node.catch;
+    for (var __i13 = 0; __i13 < __c13.length; ++__i13) {
+        var cnode = __c13[__i13];
         if (cnode.pattern !== NIL) {
             this.decindent();
             this.out(" catch /%s/", cnode.pattern);
@@ -5628,9 +5637,9 @@ RegexpParser.prototype.get_token_sq_char_class = function() {
         var r = this.reader.read_alpha();
         if (this.reader.p(0) == ":" && this.reader.p(1) == "]") {
             this.reader.seek_cur(2);
-            var __c13 = class_names;
-            for (var __i13 = 0; __i13 < __c13.length; ++__i13) {
-                var name = __c13[__i13];
+            var __c14 = class_names;
+            for (var __i14 = 0; __i14 < __c14.length; ++__i14) {
+                var name = __c14[__i14];
                 if (r == name) {
                     return "[:" + name + ":]";
                 }
@@ -5763,9 +5772,9 @@ RegexpParser.prototype.getoctchrs = function() {
 
 RegexpParser.prototype.gethexchrs = function(n) {
     var r = "";
-    var __c14 = viml_range(n);
-    for (var __i14 = 0; __i14 < __c14.length; ++__i14) {
-        var i = __c14[__i14];
+    var __c15 = viml_range(n);
+    for (var __i15 = 0; __i15 < __c15.length; ++__i15) {
+        var i = __c15[__i15];
         var c = this.reader.peek();
         if (!isxdigit(c)) {
             break;

py/vimlparser.py

@@ -3582,14 +3582,19 @@ def compile_function(self, node):
         left = self.compile(node.left)
         rlist = [self.compile(vval) for vval in node.rlist]
         default_args = [self.compile(vval) for vval in node.default_args]
-        if not viml_empty(rlist) and rlist[-1] == "...":
-            rlist[-1] = ". ..."
-        if viml_empty(rlist):
-            self.out("(function (%s)", left)
-        elif viml_empty(default_args):
-            self.out("(function (%s (%s))", left, viml_join(rlist, " "))
-        else:
-            self.out("(function (%s (%s) (%s))", left, viml_join(rlist, " "), viml_join(default_args, " "))
+        if not viml_empty(rlist):
+            remaining = v:false
+            if rlist[-1] == "...":
+                viml_remove(rlist, -1)
+                remaining = v:true
+            for i in viml_range(viml_len(rlist)):
+                if i < viml_len(rlist) - viml_len(default_args):
+                    left += viml_printf(" (%s)", rlist[i])
+                else:
+                    left += viml_printf(" (%s %s)", rlist[i], default_args[i + viml_len(default_args) - viml_len(rlist)])
+            if remaining:
+                left += " . ..."
+        self.out("(function (%s)", left)
         self.incindent("  ")
         self.compile_body(node.body)
         self.out(")")

test/test1.ok

@@ -1,7 +1,7 @@
 ; test1
-(function (s:foo (a b . ...))
+(function (s:foo (a) (b) . ...)
   (return 0))
-(function (s:bar (a b . ...) (1 2))
+(function (s:bar (a 1) (b 2) . ...)
   (return 0))
 (if 1
   (echo "if 1")

test/test_funcarg.ok

@@ -1,2 +1,2 @@
-(function (X (foo) ((+ 1 2)))
+(function (X (foo (+ 1 2)))
   (return a:foo))