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

Merge #8961 from ZyX-I/fix-8956

Browse Source
This commit is contained in:
Justin M. Keyes
2018-09-06 01:30:53 +02:00
committed by GitHub
parent 51d42917f0 a9fa66b5b8
commit 5de6f97408
2 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
runtime/autoload/msgpack.vim
View File

@@ -605,13 +605,10 @@ function msgpack#eval(s, special_objs) abort
call add(expr, dec) call add(expr, dec)
endif endif
endif endif
elseif s =~# '-\?\%(inf\|nan\)' elseif s =~# '\v^\-%(inf|nan)'
if s[0] is# '-' call add(expr, '-')
call add(expr, '-') call add(expr, s:MSGPACK_SPECIAL_OBJECTS[s[1:3]])
let s = s[1:] let s = s[4:]
endif
call add(expr, s:MSGPACK_SPECIAL_OBJECTS[s[0:2]])
let s = s[3:]
elseif stridx('="+', s[0]) != -1 elseif stridx('="+', s[0]) != -1
let match = matchlist(s, '\v\C^(\=|\+\((\-?\d+)\)|)(\"%(\\.|[^\\"]+)*\")') let match = matchlist(s, '\v\C^(\=|\+\((\-?\d+)\)|)(\"%(\\.|[^\\"]+)*\")')
if empty(match) if empty(match)

22
test/functional/plugin/msgpack_spec.lua
View File

@@ -581,6 +581,8 @@ describe('autoload/msgpack.vim', function()
eval_eq('binary', {'', 'abc', '', '', 'def'}, '"\\nabc\\n\\n\\ndef"') eval_eq('binary', {'', 'abc', '', '', 'def'}, '"\\nabc\\n\\n\\ndef"')
eval_eq('binary', {''}, '""') eval_eq('binary', {''}, '""')
eval_eq('binary', {'"'}, '"\\""') eval_eq('binary', {'"'}, '"\\""')
eval_eq('binary', {'py3 print(sys.version_info)'},
'"py3 print(sys.version_info)"')
end) end)
it('correctly loads strings', function() it('correctly loads strings', function()
@@ -595,6 +597,8 @@ describe('autoload/msgpack.vim', function()
eval_eq('string', {'', 'abc', '', '', 'def'}, '="\\nabc\\n\\n\\ndef"') eval_eq('string', {'', 'abc', '', '', 'def'}, '="\\nabc\\n\\n\\ndef"')
eval_eq('string', {''}, '=""') eval_eq('string', {''}, '=""')
eval_eq('string', {'"'}, '="\\""') eval_eq('string', {'"'}, '="\\""')
eval_eq('string', {'py3 print(sys.version_info)'},
'="py3 print(sys.version_info)"')
end) end)
it('correctly loads ext values', function() it('correctly loads ext values', function()
@@ -625,6 +629,9 @@ describe('autoload/msgpack.vim', function()
'+(-1)"\\nabc\\n\\n\\ndef"') '+(-1)"\\nabc\\n\\n\\ndef"')
eval_eq('ext', {-1, {''}}, '+(-1)""') eval_eq('ext', {-1, {''}}, '+(-1)""')
eval_eq('ext', {-1, {'"'}}, '+(-1)"\\""') eval_eq('ext', {-1, {'"'}}, '+(-1)"\\""')
eval_eq('ext', {42, {'py3 print(sys.version_info)'}},
'+(42)"py3 print(sys.version_info)"')
end) end)
it('correctly loads floats', function() it('correctly loads floats', function()
@@ -676,6 +683,13 @@ describe('autoload/msgpack.vim', function()
eval_eq('map', {{{_TYPE={}, _VAL={{1, 2}}}, {_TYPE={}, _VAL={{3, 4}}}}, eval_eq('map', {{{_TYPE={}, _VAL={{1, 2}}}, {_TYPE={}, _VAL={{3, 4}}}},
{1, 2}}, {1, 2}},
'{{1: 2}: {3: 4}, 1: 2}') '{{1: 2}: {3: 4}, 1: 2}')
eval_eq('map', {{{_TYPE={}, _VAL={
{{_TYPE={}, _VAL={'py3 print(sys.version_info)'}},
2}}},
{_TYPE={}, _VAL={{3, 4}}}},
{1, 2}},
'{{"py3 print(sys.version_info)": 2}: {3: 4}, 1: 2}')
end) end)
it('correctly loads arrays', function() it('correctly loads arrays', function()
@@ -684,6 +698,9 @@ describe('autoload/msgpack.vim', function()
eval_eq('array', {{_TYPE={}, _VAL=1}}, '[TRUE]') eval_eq('array', {{_TYPE={}, _VAL=1}}, '[TRUE]')
eval_eq('array', {{{_TYPE={}, _VAL={{1, 2}}}}, {_TYPE={}, _VAL={{3, 4}}}}, eval_eq('array', {{{_TYPE={}, _VAL={{1, 2}}}}, {_TYPE={}, _VAL={{3, 4}}}},
'[[{1: 2}], {3: 4}]') '[[{1: 2}], {3: 4}]')
eval_eq('array', {{_TYPE={}, _VAL={'py3 print(sys.version_info)'}}},
'["py3 print(sys.version_info)"]')
end) end)
it('errors out when needed', function() it('errors out when needed', function()
@@ -711,6 +728,11 @@ describe('autoload/msgpack.vim', function()
exc_exec('call msgpack#eval("0x", {})')) exc_exec('call msgpack#eval("0x", {})'))
eq('name-unknown:Unknown name FOO: FOO', eq('name-unknown:Unknown name FOO: FOO',
exc_exec('call msgpack#eval("FOO", {})')) exc_exec('call msgpack#eval("FOO", {})'))
eq('name-unknown:Unknown name py3: py3 print(sys.version_info)',
exc_exec('call msgpack#eval("py3 print(sys.version_info)", {})'))
eq('name-unknown:Unknown name o: o',
exc_exec('call msgpack#eval("-info", {})'))
end) end)
end) end)
end) end)