From 7b27fc49a8c4ce480f759dc33082e6150fb94238 Mon Sep 17 00:00:00 2001 From: Konfekt Date: Sat, 5 Oct 2024 16:17:04 +0200 Subject: [PATCH] runtime(comment): consider &tabstop in lines after whitespace indent The count `strlen()` in ```vim line = printf(indent_start .. substitute(cms, '%s\@!', '%%', 'g'), strpart(getline(lnum), strlen(indent_start))) ``` is too large if the block of lines to be operated on contains different whitespace indenting (tab vs. spaces). Considering using `2gcc` on the first line with 4 spaces as indenting and on the next line using a single tab character (with &tabstop value of 8): Using `strlen(indent_start) = 4` for an initial indent of 4 spaces is correct for the first line, but wrong for the next line and will therefore wrongly comment out the tab-indented line (and possibly deleting some content). The new check is still too simple because it assumes that as soon as there's a tab the whole indent is made of tabs; it's a start of entering the mixed tab and whitespace indent rabbit hole. fixes: #15797 closes: #15805 Signed-off-by: Konfekt Signed-off-by: Christian Brabandt --- runtime/pack/dist/opt/comment/autoload/comment.vim | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/runtime/pack/dist/opt/comment/autoload/comment.vim b/runtime/pack/dist/opt/comment/autoload/comment.vim index c758a7d403..d78b69b2a3 100644 --- a/runtime/pack/dist/opt/comment/autoload/comment.vim +++ b/runtime/pack/dist/opt/comment/autoload/comment.vim @@ -1,7 +1,7 @@ vim9script # Maintainer: Maxim Kim -# Last Update: 2024-09-30 +# Last Update: 2024 Oct 05 # # Toggle comments # Usage: @@ -58,9 +58,13 @@ export def Toggle(...args: list): string # handle % with substitute line = printf(substitute(cms, '%s\@!', '%%', 'g'), getline(lnum)) else - # handle % with substitute + line = getline(lnum) + var indent_start_len = strlen(indent_start) + # handle % with substitute, + # consider different whitespace indenting line = printf(indent_start .. substitute(cms, '%s\@!', '%%', 'g'), - strpart(getline(lnum), strlen(indent_start))) + strpart(line, (line[0 : strlen(indent_start_len) - 1] =~ '\t' ? + indent_start_len / &tabstop : indent_start_len))) endif else line = substitute(getline(lnum), $'^\s*\zs{cms_l[0]} \?\| \?{cms_l[1]}$', '', 'g')