aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-03 05:14:07 -04:00
Code Activity

patch 8.2.1838: Vim9: cannot insert a comment line in an expression

Browse Source 
Problem:    Vim9: cannot insert a comment line in an expression.
Solution:   Skip comment lines at the script level. (closes #7111)
This commit is contained in:
Bram Moolenaar
2020-10-11 21:34:41 +02:00
parent c07b7f701f
commit 93be1644db
3 changed files with 107 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
src/testdir/test_vim9_expr.vim
View File

@@ -90,6 +90,16 @@ def Test_expr1_trinary_vimscript()
END
CheckScriptSuccess(lines)
lines =<< trim END
vim9script
var name = v:false ? # comment
'yes' :
# comment
'no' # comment
assert_equal('no', name)
END
CheckScriptSuccess(lines)
# check white space
lines =<< trim END
vim9script
@@ -279,6 +289,17 @@ def Test_expr2_vimscript()
END
CheckScriptSuccess(lines)
lines =<< trim END
vim9script
var name = v:false || # comment
# comment
v:true ||
# comment
v:false # comment
assert_equal(v:true, name)
END
CheckScriptSuccess(lines)
# check white space
lines =<< trim END
vim9script
@@ -405,6 +426,17 @@ def Test_expr3_vimscript()
END
CheckScriptSuccess(lines)
lines =<< trim END
vim9script
var name = v:true && # comment
# comment
v:true &&
# comment
v:true
assert_equal(v:true, name)
END
CheckScriptSuccess(lines)
# check white space
lines =<< trim END
vim9script
@@ -800,6 +832,7 @@ def Test_expr4_vim9script()
lines =<< trim END
vim9script
var name = 123
# comment
!= 123
assert_equal(false, name)
END
@@ -822,6 +855,16 @@ def Test_expr4_vim9script()
END
CheckScriptSuccess(lines)
lines =<< trim END
vim9script
var list = [1, 2, 3]
var name = list # comment
# comment
is list
assert_equal(true, name)
END
CheckScriptSuccess(lines)
lines =<< trim END
vim9script
var myblob = 0z1234
@@ -1057,6 +1100,16 @@ def Test_expr5_vim9script()
END
CheckScriptSuccess(lines)
lines =<< trim END
vim9script
var name = 11 + # comment
77 -
# comment
22
assert_equal(66, name)
END
CheckScriptSuccess(lines)
lines =<< trim END
vim9script
var name = 'one'
@@ -1303,6 +1356,17 @@ def Test_expr6_vim9script()
END
CheckScriptSuccess(lines)
lines =<< trim END
vim9script
var name = 25
# comment
# comment
% 10
assert_equal(5, name)
END
CheckScriptSuccess(lines)
lines =<< trim END
vim9script
var name = 11 *
@@ -1618,6 +1682,12 @@ def Test_expr7_list_vim9script()
echo [1,
2] [3,
4]
echo [1, # comment
# comment
2] [3,
# comment
4]
END
CheckScriptSuccess(lines)
@@ -1832,6 +1902,17 @@ def Test_expr7_dict_vim9script()
'two': 2,
}
assert_equal({'one': 1, 'two': 2}, d)
d = { # comment
'one':
# comment
1,
# comment
# comment
'two': 2,
}
assert_equal({'one': 1, 'two': 2}, d)
END
CheckScriptSuccess(lines)