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

message: don't output unprintable chars to screen

Browse Source 
fixes #7586 #8070
This commit is contained in:
Björn Linse
2018-02-27 10:02:04 +01:00
parent a98736b9c0
commit cee9a8ce8a
2 changed files with 96 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/nvim/message.c
View File

@@ -1825,17 +1825,13 @@ static void msg_puts_display(const char_u *str, int maxlen, int attr,
} while (msg_col & 7); } while (msg_col & 7);
} else if (*s == BELL) { // beep (from ":sh") } else if (*s == BELL) { // beep (from ":sh")
vim_beep(BO_SH); vim_beep(BO_SH);
} else { } else if (*s >= 0x20) { // printable char
if (has_mbyte) { cw = mb_ptr2cells(s);
cw = (*mb_ptr2cells)(s); if (maxlen >= 0) {
if (enc_utf8 && maxlen >= 0) // avoid including composing chars after the end
/* avoid including composing chars after the end */ l = utfc_ptr2len_len(s, (int)((str + maxlen) - s));
l = utfc_ptr2len_len(s, (int)((str + maxlen) - s));
else
l = (*mb_ptr2len)(s);
} else { } else {
cw = 1; l = utfc_ptr2len(s);
l = 1;
} }
// When drawing from right to left or when a double-wide character // When drawing from right to left or when a double-wide character
// doesn't fit, draw a single character here. Otherwise collect // doesn't fit, draw a single character here. Otherwise collect

90
test/functional/ui/input_spec.lua
View File

@@ -2,6 +2,7 @@ local helpers = require('test.functional.helpers')(after_each)
local clear, feed_command, nvim = helpers.clear, helpers.feed_command, helpers.nvim local clear, feed_command, nvim = helpers.clear, helpers.feed_command, helpers.nvim
local feed, next_message, eq = helpers.feed, helpers.next_message, helpers.eq local feed, next_message, eq = helpers.feed, helpers.next_message, helpers.eq
local expect = helpers.expect local expect = helpers.expect
local write_file = helpers.write_file
local Screen = require('test.functional.ui.screen') local Screen = require('test.functional.ui.screen')
describe('mappings', function() describe('mappings', function()
@@ -124,3 +125,92 @@ describe('input utf sequences that contain CSI/K_SPECIAL', function()
expect('…') expect('…')
end) end)
end) end)
describe('input non-printable chars', function()
it("doesn't crash when echoing them back", function()
write_file("Xtest-overwrite", [[foobar]])
clear()
local screen = Screen.new(60,8)
screen:set_default_attr_ids({
[1] = {bold = true, foreground = Screen.colors.Blue1},
[2] = {foreground = Screen.colors.Grey100, background = Screen.colors.Red},
[3] = {bold = true, foreground = Screen.colors.SeaGreen4}
})
screen:attach()
feed_command("e Xtest-overwrite")
screen:expect([[
^foobar |
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
"Xtest-overwrite" [noeol] 1L, 6C |
]])
-- The timestamp is in second resolution, wait two seconds to be sure.
screen:sleep(2000)
write_file("Xtest-overwrite", [[smurf]])
feed_command("w")
screen:expect([[
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
"Xtest-overwrite" |
{2:WARNING: The file has been changed since reading it!!!} |
{3:Do you really want to write to it (y/n)?}^ |
]])
feed("u")
screen:expect([[
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
"Xtest-overwrite" |
{2:WARNING: The file has been changed since reading it!!!} |
{3:Do you really want to write to it (y/n)?}u |
{3:Do you really want to write to it (y/n)?}^ |
]])
feed("\005")
screen:expect([[
{1:~ }|
{1:~ }|
{1:~ }|
"Xtest-overwrite" |
{2:WARNING: The file has been changed since reading it!!!} |
{3:Do you really want to write to it (y/n)?}u |
{3:Do you really want to write to it (y/n)?} |
{3:Do you really want to write to it (y/n)?}^ |
]])
feed("n")
screen:expect([[
{1:~ }|
{1:~ }|
"Xtest-overwrite" |
{2:WARNING: The file has been changed since reading it!!!} |
{3:Do you really want to write to it (y/n)?}u |
{3:Do you really want to write to it (y/n)?} |
{3:Do you really want to write to it (y/n)?}n |
{3:Press ENTER or type command to continue}^ |
]])
feed("<cr>")
screen:expect([[
^foobar |
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
|
]])
end)
end)