refactor(defaults)!: change default 'commentstring' value to empty (#22862)

This commit is contained in:
zeertzjq 2023-04-02 23:01:48 +08:00 committed by GitHub
parent 3a4db8154f
commit 269dd747b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 18 additions and 5 deletions

View File

@ -66,6 +66,8 @@ The following changes may require adaptations in user config or plugins.
change is that language-specific highlight groups need to be renamed from
`@foo.help` to `@foo.vimdoc`.
• The default value of 'commentstring' is now empty instead of "/*%s*/".
==============================================================================
NEW FEATURES *news-features*

View File

@ -1390,7 +1390,7 @@ A jump table for the options with a short description can be found at |Q_op|.
insert a space.
*'commentstring'* *'cms'* *E537*
'commentstring' 'cms' string (default "/*%s*/")
'commentstring' 'cms' string (default "")
local to buffer
A template for a comment. The "%s" in the value is replaced with the
comment text. Currently only used to add markers for folding, see

View File

@ -34,6 +34,7 @@ Defaults *nvim-defaults*
- 'backspace' defaults to "indent,eol,start"
- 'backupdir' defaults to .,~/.local/state/nvim/backup// (|xdg|), auto-created
- 'belloff' defaults to "all"
- 'commentstring' defaults to ""
- 'compatible' is always disabled
- 'complete' excludes "i"
- 'directory' defaults to ~/.local/state/nvim/swap// (|xdg|), auto-created

1
runtime/ftplugin/c.lua Normal file
View File

@ -0,0 +1 @@
vim.bo.commentstring = '/*%s*/'

View File

@ -0,0 +1 @@
vim.bo.commentstring = '/*%s*/'

1
runtime/ftplugin/css.lua Normal file
View File

@ -0,0 +1 @@
vim.bo.commentstring = '/*%s*/'

View File

@ -0,0 +1 @@
vim.bo.commentstring = '/*%s*/'

View File

@ -0,0 +1 @@
vim.bo.commentstring = '/*%s*/'

View File

@ -413,7 +413,7 @@ return {
alloced=true,
redraw={'curswant'},
varname='p_cms',
defaults={if_true="/*%s*/"}
defaults={if_true=""}
},
{
full_name='compatible', abbreviation='cp',

View File

@ -75,7 +75,7 @@ local function reopenwithfolds(b)
local tick = reopen(b, origlines)
-- use markers for folds, make all folds open by default
command('setlocal foldmethod=marker foldlevel=20')
command('setlocal foldmethod=marker foldlevel=20 commentstring=/*%s*/')
-- add a fold
command('2,4fold')

View File

@ -116,6 +116,7 @@ describe('splitkeep', function()
-- oldtest: Test_splitkeep_fold()
it('does not scroll when window has closed folds', function()
exec([[
set commentstring=/*%s*/
set splitkeep=screen
set foldmethod=marker
set number

View File

@ -2032,8 +2032,11 @@ describe("folded lines", function()
end)
it('multibyte fold markers work #20438', function()
meths.win_set_option(0, 'foldmethod', 'marker')
meths.win_set_option(0, 'foldmarker', '«,»')
exec([[
setlocal foldmethod=marker
setlocal foldmarker=«,»
setlocal commentstring=/*%s*/
]])
insert([[
bbbbb
bbbbb

View File

@ -1,6 +1,7 @@
if exists('s:did_load')
" Align Nvim defaults to Vim.
set backspace=
set commentstring=/*%s*/
set complete=.,w,b,u,t,i
set directory&
set directory^=.