mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-07 11:58:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

unittests: Add some more edge test cases

Browse Source
This commit is contained in:
ZyX
2017-11-12 03:52:26 +03:00
parent c7495ebcc0
commit 45445e2e03
2 changed files with 150 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/nvim/viml/parser/expressions.c
View File

@@ -40,6 +40,13 @@
// E15: Invalid expression: [1,
//
// < , just exactly one E697 message.
// 6. Some expressions involving calling parenthesis which are treated
// separately by Vim even when not separated by spaces are treated as one
// expression by Neovim: e.g. ":echo (1)(1)" will yield runtime error after
// failing to call "1", while Vim will echo "1 1". Reasoning is the same:
// type of what is in the first expression is generally not known when
// parsing, so to have separate expressions like this separate them with
// spaces.
#include <stdbool.h>
#include <stddef.h>

143
test/unit/viml/expressions/parser_spec.lua
View File

@@ -1233,6 +1233,132 @@ describe('Expressions parser', function()
hl('CallingParenthesis', ')'),
hl('CallingParenthesis', ')'),
})
check_parsing('()()', {
-- 0123
ast = {
{
'Call:0:2:(',
children = {
{
'Nested:0:0:(',
children = {
'Missing:0:1:',
},
},
},
},
},
err = {
arg = ')()',
msg = 'E15: Expected value, got parenthesis: %.*s',
},
}, {
hl('NestingParenthesis', '('),
hl('InvalidNestingParenthesis', ')'),
hl('CallingParenthesis', '('),
hl('CallingParenthesis', ')'),
})
check_parsing('(@a)()', {
-- 012345
ast = {
{
'Call:0:4:(',
children = {
{
'Nested:0:0:(',
children = {
'Register(name=a):0:1:@a',
},
},
},
},
},
}, {
hl('NestingParenthesis', '('),
hl('Register', '@a'),
hl('NestingParenthesis', ')'),
hl('CallingParenthesis', '('),
hl('CallingParenthesis', ')'),
})
check_parsing('(@a)(@b)', {
-- 01234567
ast = {
{
'Call:0:4:(',
children = {
{
'Nested:0:0:(',
children = {
'Register(name=a):0:1:@a',
},
},
'Register(name=b):0:5:@b',
},
},
},
}, {
hl('NestingParenthesis', '('),
hl('Register', '@a'),
hl('NestingParenthesis', ')'),
hl('CallingParenthesis', '('),
hl('Register', '@b'),
hl('CallingParenthesis', ')'),
})
check_parsing('(@a) (@b)', {
-- 012345678
ast = {
{
'OpMissing:0:4:',
children = {
{
'Nested:0:0:(',
children = {
'Register(name=a):0:1:@a',
},
},
{
'Nested:0:4: (',
children = {
'Register(name=b):0:6:@b',
},
},
},
},
},
err = {
arg = '(@b)',
msg = 'E15: Missing operator: %.*s',
},
}, {
hl('NestingParenthesis', '('),
hl('Register', '@a'),
hl('NestingParenthesis', ')'),
hl('InvalidSpacing', ' '),
hl('NestingParenthesis', '('),
hl('Register', '@b'),
hl('NestingParenthesis', ')'),
}, {
[1] = {
ast = {
ast = {
{
'Nested:0:0:(',
children = {
'Register(name=a):0:1:@a',
REMOVE_THIS,
},
},
},
err = REMOVE_THIS,
},
hl_fs = {
[4] = REMOVE_THIS,
[5] = REMOVE_THIS,
[6] = REMOVE_THIS,
[7] = REMOVE_THIS,
},
},
})
end)
itp('works with variable names, including curly braces ones', function()
check_parsing('var', {
@@ -1543,6 +1669,21 @@ describe('Expressions parser', function()
hl('FigureBrace', '{'),
hl('Register', '@a'),
})
check_parsing('a ()', {
-- 0123
ast = {
{
'Call:0:1: (',
children = {
'PlainIdentifier(scope=0,ident=a):0:0:a',
},
},
},
}, {
hl('IdentifierName', 'a'),
hl('CallingParenthesis', '(', 1),
hl('CallingParenthesis', ')'),
})
end)
itp('works with lambdas and dictionaries', function()
check_parsing('{}', {
@@ -7346,4 +7487,6 @@ describe('Expressions parser', function()
end)
-- FIXME: Test assignments thoroughly
-- FIXME: Test that parsing assignments can be used for `:for` pre-`in` part.
-- FIXME: Somehow make functional tests use the same code. Or, at least,
-- create an automated script which will do the import.
end)