diff options
author | James McCoy <jamessan@jamessan.com> | 2018-01-15 22:28:41 -0500 |
---|---|---|
committer | James McCoy <jamessan@jamessan.com> | 2018-01-15 22:55:15 -0500 |
commit | 514a51ef3e63362d9d96f23930bbde5cd8581da8 (patch) | |
tree | f7d66fb28eaaa34b6ac80c4cb84922f0edd13aeb | |
parent | c06995b34d604a37f80ee1174fcb3530dbd59206 (diff) | |
download | rneovim-514a51ef3e63362d9d96f23930bbde5cd8581da8.tar.gz rneovim-514a51ef3e63362d9d96f23930bbde5cd8581da8.tar.bz2 rneovim-514a51ef3e63362d9d96f23930bbde5cd8581da8.zip |
get_buffer_lines: Return a string, when requested, on invalid input
Closes #7859
-rw-r--r-- | src/nvim/eval.c | 4 | ||||
-rw-r--r-- | test/functional/eval/getline_spec.lua | 39 |
2 files changed, 42 insertions, 1 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index b6767c3457..28c590c0b4 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -9259,7 +9259,9 @@ static void get_buffer_lines(buf_T *buf, linenr_T start, linenr_T end, int retli rettv->vval.v_string = NULL; if (buf == NULL || buf->b_ml.ml_mfp == NULL || start < 0 || end < start) { - tv_list_alloc_ret(rettv, 0); + if (retlist) { + tv_list_alloc_ret(rettv, 0); + } return; } diff --git a/test/functional/eval/getline_spec.lua b/test/functional/eval/getline_spec.lua new file mode 100644 index 0000000000..8082745ec0 --- /dev/null +++ b/test/functional/eval/getline_spec.lua @@ -0,0 +1,39 @@ +local helpers = require('test.functional.helpers')(after_each) + +local call = helpers.call +local clear = helpers.clear +local eq = helpers.eq +local expect = helpers.expect + +describe('getline', function() + before_each(function() + clear() + call('setline', 1, {'a', 'b', 'c'}) + expect([[ + a + b + c]]) + end) + + it('returns empty string for invalid line', function() + eq('', call('getline', -1)) + eq('', call('getline', 0)) + eq('', call('getline', 4)) + end) + + it('returns empty list for invalid range', function() + eq({}, call('getline', 2, 1)) + eq({}, call('getline', -1, 1)) + eq({}, call('getline', 4, 4)) + end) + + it('returns value of valid line', function() + eq('b', call('getline', 2)) + eq('a', call('getline', '.')) + end) + + it('returns value of valid range', function() + eq({'a', 'b'}, call('getline', 1, 2)) + eq({'a', 'b', 'c'}, call('getline', 1, 4)) + end) +end) |