feat(ftplugin): change 'commentstring' to // %s for C/C++ (#29085)

Problem: The default commentstring for C/C++ can lead to invalid code 
when commenting and does not match the Nvim codebase.

Solution: Change commentstring to `// %s` as used by Neovim. Also
set all commentstrings that derive from the default C string explicitly
(and correctly).
This commit is contained in:
Soham Shanbhag 2024-06-03 16:48:43 +09:00 committed by GitHub
parent 3a1515bfee
commit 054a287dbe
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
12 changed files with 12 additions and 8 deletions

View File

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

View File

@ -1,5 +1,5 @@
-- These are the default option values in Vim, but not in Nvim, so must be set explicitly.
vim.bo.commentstring = '/*%s*/'
vim.bo.commentstring = '// %s'
vim.bo.define = '^\\s*#\\s*define'
vim.bo.include = '^\\s*#\\s*include'

View File

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

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

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

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

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

View File

@ -406,7 +406,7 @@ describe('runtime:', function()
eq('', eval('&commentstring'))
eq('', eval('&omnifunc'))
exec('edit file.cpp')
eq('/*%s*/', eval('&commentstring'))
eq('// %s', eval('&commentstring'))
eq('ccomplete#Complete', eval('&omnifunc'))
end)
end)