mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-12-05 14:13:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #1981 'treat NULL initialized vimscript string as api type String'

Browse Source
This commit is contained in:
Justin M. Keyes
2015-02-16 20:13:55 -05:00
parent fd636fc6dc f4f0f646c3
commit 3bb77befe5
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/nvim/api/private/helpers.c
View File

@@ -644,10 +644,8 @@ static Object vim_to_object_rec(typval_T *obj, PMap(ptr_t) *lookup)
switch (obj->v_type) { switch (obj->v_type) {
case VAR_STRING: case VAR_STRING:
if (obj->vval.v_string != NULL) { rv.type = kObjectTypeString;
rv.type = kObjectTypeString; rv.data.string = cstr_to_string((char *) obj->vval.v_string);
rv.data.string = cstr_to_string((char *) obj->vval.v_string);
}
break; break;
case VAR_NUMBER: case VAR_NUMBER:

5
test/functional/api/vim_spec.lua
View File

@@ -27,6 +27,11 @@ describe('vim_* functions', function()
nvim('command', 'let g:v2 = [1, 2, {"v3": 3}]') nvim('command', 'let g:v2 = [1, 2, {"v3": 3}]')
eq({v1 = 'a', v2 = {1, 2, {v3 = 3}}}, nvim('eval', 'g:')) eq({v1 = 'a', v2 = {1, 2, {v3 = 3}}}, nvim('eval', 'g:'))
end) end)
it('handles NULL-initialized strings correctly', function()
eq(1, nvim('eval',"matcharg(1) == ['', '']"))
eq({'', ''}, nvim('eval','matcharg(1)'))
end)
end) end)
describe('strwidth', function() describe('strwidth', function()

2
test/functional/shell/viml_system_spec.lua
View File

@@ -191,7 +191,7 @@ describe('system()', function()
if xclip then if xclip then
describe("with a program that doesn't close stdout", function() describe("with a program that doesn't close stdout", function()
it('will exit properly after passing input', function() it('will exit properly after passing input', function()
eq(nil, eval([[system('xclip -i -selection clipboard', 'clip-data')]])) eq('', eval([[system('xclip -i -selection clipboard', 'clip-data')]]))
eq('clip-data', eval([[system('xclip -o -selection clipboard')]])) eq('clip-data', eval([[system('xclip -o -selection clipboard')]]))
end) end)
end) end)