diff options
| -rw-r--r-- | runtime/doc/eval.txt | 11 | ||||
| -rw-r--r-- | src/nvim/api/vim.c | 10 | ||||
| -rw-r--r-- | src/nvim/tui/input.c | 11 | ||||
| -rw-r--r-- | test/functional/terminal/tui_spec.lua | 13 |
4 files changed, 22 insertions, 23 deletions
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index 2ec72f7717..897b5df072 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -4214,17 +4214,6 @@ getchar([expr]) *getchar()* : endwhile :endfunction < - You may also receive synthetic characters, such as - |<LeftMouse>|. Often you will want to ignore this and get - another character: > - :function GetKey() - : let c = getchar() - : while c == "\<LeftMouse>" - : let c = getchar() - : endwhile - : return c - :endfunction - getcharmod() *getcharmod()* The result is a Number which is the state of the modifiers for the last obtained character with getchar() or in another way. diff --git a/src/nvim/api/vim.c b/src/nvim/api/vim.c index bafb21bd4e..9ba855b61f 100644 --- a/src/nvim/api/vim.c +++ b/src/nvim/api/vim.c @@ -1210,9 +1210,13 @@ Dictionary nvim_get_namespaces(void) /// /// Compare |:put| and |p| which are always linewise. /// -/// @param lines contents -/// @param type type ("c", "l", "b") or empty to guess from contents -/// @param direction behave like |P| instead of |p| +/// @param lines |readfile()|-style list of lines. |channel-lines| +/// @param type Edit behavior: +/// - "b" |blockwise-visual| mode +/// - "c" |characterwise| mode +/// - "l" |linewise| mode +/// - "" guess by contents +/// @param direction Behave like |P| instead of |p| /// @param[out] err Error details, if any void nvim_put(ArrayOf(String) lines, String type, Boolean direction, Error *err) diff --git a/src/nvim/tui/input.c b/src/nvim/tui/input.c index 79615e30da..8ee9640f9f 100644 --- a/src/nvim/tui/input.c +++ b/src/nvim/tui/input.c @@ -104,9 +104,9 @@ static Array string_to_array(const String input) { Array ret = ARRAY_DICT_INIT; for (size_t i = 0; i < input.size; i++) { - const char *const start = input.data + i; - const size_t line_len - = (size_t)((char *)xmemscan(start, NL, input.size - i) - start); + const char *start = input.data + i; + const char *end = xmemscan(start, NL, input.size - i); + const size_t line_len = (size_t)(end - start); i += line_len; String s = { @@ -115,6 +115,11 @@ static Array string_to_array(const String input) }; memchrsub(s.data, NUL, NL, line_len); ADD(ret, STRING_OBJ(s)); + // If line ends at end-of-buffer, add empty final item. + // This is "readfile()-style", see also ":help channel-lines". + if (i + 1 == input.size && end[0] == NL) { + ADD(ret, STRING_OBJ(cchar_to_string(NUL))); + } } return ret; diff --git a/test/functional/terminal/tui_spec.lua b/test/functional/terminal/tui_spec.lua index 4a450b2fb4..6b12c1a889 100644 --- a/test/functional/terminal/tui_spec.lua +++ b/test/functional/terminal/tui_spec.lua @@ -189,20 +189,20 @@ describe('TUI', function() it('paste: exactly 64 bytes #10311', function() -- "bracketed paste" feed_data('i\027[200~'..string.rep('z', 64)..'\027[201~') - feed_data('\003') -- CTRL-C + feed_data(' end') screen:expect([[ zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz| - zzzzzzzzzzzzz{1:z} | + zzzzzzzzzzzzzz end{1: } | {4:~ }| {4:~ }| {5:[No Name] [+] }| - | + {3:-- INSERT --} | {3:-- TERMINAL --} | ]]) end) it('paste: big burst of input', function() - feed_command('set ruler') + feed_data(':set ruler\013') local t = {} for i = 1, 3000 do t[i] = 'item ' .. tostring(i) @@ -210,12 +210,13 @@ describe('TUI', function() local expected = table.concat(t, '\n') -- "bracketed paste" feed_data('i\027[200~'..expected..'\027[201~') + feed_data(' end') screen:expect([[ item 2997 | item 2998 | item 2999 | - item 3000{1: } | - {5:[No Name] [+] 3000,10 Bot}| + item 3000 end{1: } | + {5:[No Name] [+] 3000,14 Bot}| {3:-- INSERT --} | {3:-- TERMINAL --} | ]]) |