Skip to content

Commit 4a79872

Browse files
author
Luma
committed
Omit parenthesis when no default arg
1 parent 89250b0 commit 4a79872

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

autoload/vimlparser.vim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4979,7 +4979,7 @@ function! s:Compiler.compile_function(node) abort
49794979
endif
49804980
for i in range(len(rlist))
49814981
if i < len(rlist) - len(default_args)
4982-
let left .= printf(' (%s)', rlist[i])
4982+
let left .= printf(' %s', rlist[i])
49834983
else
49844984
let left .= printf(' (%s %s)', rlist[i], default_args[i + len(default_args) - len(rlist)])
49854985
endif

js/vimlparser.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4476,16 +4476,16 @@ Compiler.prototype.compile_function = function(node) {
44764476
var rlist = node.rlist.map((function(vval) { return this.compile(vval); }).bind(this));
44774477
var default_args = node.default_args.map((function(vval) { return this.compile(vval); }).bind(this));
44784478
if (!viml_empty(rlist)) {
4479-
var remaining = v:false;
4479+
var remaining = FALSE;
44804480
if (rlist[rlist.length - 1] == "...") {
44814481
viml_remove(rlist, -1);
4482-
var remaining = v:true;
4482+
var remaining = TRUE;
44834483
}
44844484
var __c11 = viml_range(viml_len(rlist));
44854485
for (var __i11 = 0; __i11 < __c11.length; ++__i11) {
44864486
var i = __c11[__i11];
44874487
if (i < viml_len(rlist) - viml_len(default_args)) {
4488-
left += viml_printf(" (%s)", rlist[i]);
4488+
left += viml_printf(" %s", rlist[i]);
44894489
}
44904490
else {
44914491
left += viml_printf(" (%s %s)", rlist[i], default_args[i + viml_len(default_args) - viml_len(rlist)]);

py/vimlparser.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3583,13 +3583,13 @@ def compile_function(self, node):
35833583
rlist = [self.compile(vval) for vval in node.rlist]
35843584
default_args = [self.compile(vval) for vval in node.default_args]
35853585
if not viml_empty(rlist):
3586-
remaining = v:false
3586+
remaining = FALSE
35873587
if rlist[-1] == "...":
35883588
viml_remove(rlist, -1)
3589-
remaining = v:true
3589+
remaining = TRUE
35903590
for i in viml_range(viml_len(rlist)):
35913591
if i < viml_len(rlist) - viml_len(default_args):
3592-
left += viml_printf(" (%s)", rlist[i])
3592+
left += viml_printf(" %s", rlist[i])
35933593
else:
35943594
left += viml_printf(" (%s %s)", rlist[i], default_args[i + viml_len(default_args) - viml_len(rlist)])
35953595
if remaining:

test/test1.ok

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
; test1
2-
(function (s:foo (a) (b) . ...)
2+
(function (s:foo a b . ...)
33
(return 0))
44
(function (s:bar (a 1) (b 2) . ...)
55
(return 0))

test/test_xxx_funcarg_last_comma.ok

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
(function (F (a)))
2-
(function (G (a)))
1+
(function (F a))
2+
(function (G a))

0 commit comments

Comments
 (0)