mirror of
https://github.com/vim/vim.git
synced 2025-07-26 11:04:33 -04:00
f64bafd98a
- fix regression where toggling doesn't properly remove comment chars in files with tabs indents only. - refactor toggling comments for mixed tabs & spaces sources closes: #15861 Signed-off-by: Maxim Kim <habamax@gmail.com> Signed-off-by: Christian Brabandt <cb@256bit.org>
79 lines
3.1 KiB
VimL
79 lines
3.1 KiB
VimL
vim9script
|
|
|
|
# Maintainer: Maxim Kim <habamax@gmail.com>
|
|
# Last Update: 2024 Oct 05
|
|
#
|
|
# Toggle comments
|
|
# Usage:
|
|
# Add following mappings to vimrc:
|
|
# import autoload 'dist/comment.vim'
|
|
# nnoremap <silent> <expr> gc comment.Toggle()
|
|
# xnoremap <silent> <expr> gc comment.Toggle()
|
|
# nnoremap <silent> <expr> gcc comment.Toggle() .. '_'
|
|
# nnoremap <silent> <expr> gC comment.Toggle() .. '$'
|
|
export def Toggle(...args: list<string>): string
|
|
if len(args) == 0
|
|
&opfunc = matchstr(expand('<stack>'), '[^. ]*\ze[')
|
|
return 'g@'
|
|
endif
|
|
if empty(&cms) || !&ma | return '' | endif
|
|
var cms = substitute(substitute(&cms, '\S\zs%s\s*', ' %s', ''), '%s\ze\S', '%s ', '')
|
|
var [lnum1, lnum2] = [line("'["), line("']")]
|
|
var cms_l = split(escape(cms, '*.'), '\s*%s\s*')
|
|
|
|
var first_col = indent(lnum1)
|
|
var start_col = getpos("'[")[2] - 1
|
|
if len(cms_l) == 1 && lnum1 == lnum2 && first_col < start_col
|
|
var line_start = getline(lnum1)[0 : start_col - 1]
|
|
var line_end = getline(lnum1)[start_col : -1]
|
|
line_end = line_end =~ $'^\s*{cms_l[0]}' ?
|
|
\ substitute(line_end, $'^\s*\zs{cms_l[0]}\s\ze\s*', line_end =~ '^\s' ? ' ' : '', '') :
|
|
\ printf(substitute(cms, '%s\@!', '%%', ''), line_end)
|
|
setline(lnum1, line_start .. line_end)
|
|
return ''
|
|
endif
|
|
|
|
if len(cms_l) == 0 | return '' | endif
|
|
if len(cms_l) == 1 | call add(cms_l, '') | endif
|
|
var comment = false
|
|
var indent_spaces = false
|
|
var indent_tabs = false
|
|
var indent_min = indent(lnum1)
|
|
var indent_start = matchstr(getline(lnum1), '^\s*')
|
|
for lnum in range(lnum1, lnum2)
|
|
if getline(lnum) =~ '^\s*$' | continue | endif
|
|
var indent_str = matchstr(getline(lnum), '^\s*')
|
|
if indent_min > indent(lnum)
|
|
indent_min = indent(lnum)
|
|
indent_start = indent_str
|
|
endif
|
|
indent_spaces = indent_spaces || (stridx(indent_str, ' ') != -1)
|
|
indent_tabs = indent_tabs || (stridx(indent_str, "\t") != -1)
|
|
if getline(lnum) !~ $'^\s*{cms_l[0]}.*{cms_l[1]}$'
|
|
comment = true
|
|
endif
|
|
endfor
|
|
var mixed_indent = indent_spaces && indent_tabs
|
|
var lines = []
|
|
var line = ''
|
|
for lnum in range(lnum1, lnum2)
|
|
if getline(lnum) =~ '^\s*$'
|
|
line = getline(lnum)
|
|
elseif comment
|
|
if exists("g:comment_first_col") || exists("b:comment_first_col")
|
|
line = printf(substitute(cms, '%s\@!', '%%', 'g'), getline(lnum))
|
|
else
|
|
# consider different whitespace indenting
|
|
var indent_current = mixed_indent ? matchstr(getline(lnum), '^\s*') : indent_start
|
|
line = printf(indent_current .. substitute(cms, '%s\@!', '%%', 'g'),
|
|
strpart(getline(lnum), strlen(indent_current)))
|
|
endif
|
|
else
|
|
line = substitute(getline(lnum), $'^\s*\zs{cms_l[0]} \?\| \?{cms_l[1]}$', '', 'g')
|
|
endif
|
|
add(lines, line)
|
|
endfor
|
|
noautocmd keepjumps setline(lnum1, lines)
|
|
return ''
|
|
enddef
|