IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14124 from chentau/extmark_tab

Browse Source 
Correctly splice extmarks on tab with `noexpandtab`
This commit is contained in:
Björn Linse 2021-03-23 08:59:14 +01:00 committed by GitHub
commit 691a72bb68
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 73 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/nvim/edit.c
View File

@ -8764,6 +8764,10 @@ static bool ins_tab(void)
getvcol(curwin, &fpos, &vcol, NULL, NULL); getvcol(curwin, &fpos, &vcol, NULL, NULL);
getvcol(curwin, cursor, &want_vcol, NULL, NULL); getvcol(curwin, cursor, &want_vcol, NULL, NULL);
// save start of changed region for extmark_splice
int start_row = fpos.lnum;
colnr_T start_col = fpos.col;
// Use as many TABs as possible. Beware of 'breakindent', 'showbreak' // Use as many TABs as possible. Beware of 'breakindent', 'showbreak'
// and 'linebreak' adding extra virtual columns. // and 'linebreak' adding extra virtual columns.
while (ascii_iswhite(*ptr)) { while (ascii_iswhite(*ptr)) {
@ -8813,6 +8817,11 @@ static bool ins_tab(void)
replace_join(repl_off); replace_join(repl_off);
} }
} }
if (!(State & VREPLACE_FLAG)) {
extmark_splice_cols(curbuf, start_row - 1, start_col,
cursor->col - start_col, fpos.col - start_col,
kExtmarkUndo);
}
} }
cursor->col -= i; cursor->col -= i;

64
test/functional/lua/buffer_updates_spec.lua
View File

@ -666,6 +666,70 @@ describe('lua: nvim_buf_attach on_bytes', function()
} }
end) end)
it("tab with noexpandtab and softtabstop", function()
command("set noet")
command("set ts=4")
command("set sw=2")
command("set sts=2")
local check_events = setup_eventcheck(verify, {'asdfasdf'})
feed("gg0i<tab>")
check_events {
{ "test1", "bytes", 1, 3, 0, 0, 0, 0, 0, 0, 0, 1, 1 },
{ "test1", "bytes", 1, 4, 0, 1, 1, 0, 0, 0, 0, 1, 1 },
}
feed("<tab>")
-- when spaces are merged into a tabstop
check_events {
{ "test1", "bytes", 1, 5, 0, 2, 2, 0, 0, 0, 0, 1, 1 },
{ "test1", "bytes", 1, 6, 0, 3, 3, 0, 0, 0, 0, 1, 1 },
{ "test1", "bytes", 1, 7, 0, 0, 0, 0, 4, 4, 0, 1, 1 },
}
feed("<esc>u")
check_events {
{ "test1", "bytes", 1, 8, 0, 0, 0, 0, 1, 1, 0, 4, 4 },
{ "test1", "bytes", 1, 8, 0, 0, 0, 0, 4, 4, 0, 0, 0 }
}
-- in REPLACE mode
feed("R<tab><tab>")
check_events {
{ "test1", "bytes", 1, 9, 0, 0, 0, 0, 1, 1, 0, 1, 1 },
{ "test1", "bytes", 1, 10, 0, 1, 1, 0, 0, 0, 0, 1, 1 },
{ "test1", "bytes", 1, 11, 0, 2, 2, 0, 1, 1, 0, 1, 1 },
{ "test1", "bytes", 1, 12, 0, 3, 3, 0, 0, 0, 0, 1, 1 },
{ "test1", "bytes", 1, 13, 0, 0, 0, 0, 4, 4, 0, 1, 1 },
}
feed("<esc>u")
check_events {
{ "test1", "bytes", 1, 14, 0, 0, 0, 0, 1, 1, 0, 4, 4 },
{ "test1", "bytes", 1, 14, 0, 2, 2, 0, 2, 2, 0, 1, 1 },
{ "test1", "bytes", 1, 14, 0, 0, 0, 0, 2, 2, 0, 1, 1 }
}
-- in VISUALREPLACE mode
feed("gR<tab><tab>")
check_events {
{ "test1", "bytes", 1, 15, 0, 0, 0, 0, 1, 1, 0, 1, 1 };
{ "test1", "bytes", 1, 16, 0, 1, 1, 0, 1, 1, 0, 1, 1 };
{ "test1", "bytes", 1, 17, 0, 2, 2, 0, 1, 1, 0, 1, 1 };
{ "test1", "bytes", 1, 18, 0, 3, 3, 0, 1, 1, 0, 1, 1 };
{ "test1", "bytes", 1, 19, 0, 3, 3, 0, 1, 1, 0, 0, 0 };
{ "test1", "bytes", 1, 20, 0, 3, 3, 0, 0, 0, 0, 1, 1 };
{ "test1", "bytes", 1, 22, 0, 2, 2, 0, 1, 1, 0, 0, 0 };
{ "test1", "bytes", 1, 23, 0, 2, 2, 0, 0, 0, 0, 1, 1 };
{ "test1", "bytes", 1, 25, 0, 1, 1, 0, 1, 1, 0, 0, 0 };
{ "test1", "bytes", 1, 26, 0, 1, 1, 0, 0, 0, 0, 1, 1 };
{ "test1", "bytes", 1, 28, 0, 0, 0, 0, 1, 1, 0, 0, 0 };
{ "test1", "bytes", 1, 29, 0, 0, 0, 0, 0, 0, 0, 1, 1 };
{ "test1", "bytes", 1, 31, 0, 0, 0, 0, 4, 4, 0, 1, 1 };
}
end)
it("sends events when undoing with undofile", function() it("sends events when undoing with undofile", function()
write_file("Xtest-undofile", dedent([[ write_file("Xtest-undofile", dedent([[
12345 12345