mirror of
				https://github.com/vim/vim.git
				synced 2025-10-29 09:37:35 -04:00 
			
		
		
		
	Problem:  no whitespace padding in commentstring option in ftplugins
Solution: Change default to include whitespace padding, update
          existing filetype plugins with the new default value
          (Riley Bruins)
closes: #14843
Signed-off-by: Riley Bruins <ribru17@hotmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
		
	
		
			
				
	
	
		
			128 lines
		
	
	
		
			5.1 KiB
		
	
	
	
		
			VimL
		
	
	
	
	
	
			
		
		
	
	
			128 lines
		
	
	
		
			5.1 KiB
		
	
	
	
		
			VimL
		
	
	
	
	
	
| " Vim filetype plugin
 | |
| " Language:		Vim
 | |
| " Maintainer:		Doug Kearns <dougkearns@gmail.com>
 | |
| " Last Change:		2024 Apr 13
 | |
| " 			2024 May 23 by Riley Bruins <ribru17@gmail.com> ('commentstring')
 | |
| " Former Maintainer:	Bram Moolenaar <Bram@vim.org>
 | |
| 
 | |
| " Only do this when not done yet for this buffer
 | |
| if exists("b:did_ftplugin")
 | |
|   finish
 | |
| endif
 | |
| 
 | |
| " Don't load another plugin for this buffer
 | |
| let b:did_ftplugin = 1
 | |
| 
 | |
| let s:cpo_save = &cpo
 | |
| set cpo&vim
 | |
| 
 | |
| if !exists('*VimFtpluginUndo')
 | |
|   func VimFtpluginUndo()
 | |
|     setl fo< isk< com< tw< commentstring< include< define<
 | |
|     if exists('b:did_add_maps')
 | |
|       silent! nunmap <buffer> [[
 | |
|       silent! vunmap <buffer> [[
 | |
|       silent! nunmap <buffer> ]]
 | |
|       silent! vunmap <buffer> ]]
 | |
|       silent! nunmap <buffer> []
 | |
|       silent! vunmap <buffer> []
 | |
|       silent! nunmap <buffer> ][
 | |
|       silent! vunmap <buffer> ][
 | |
|       silent! nunmap <buffer> ]"
 | |
|       silent! vunmap <buffer> ]"
 | |
|       silent! nunmap <buffer> ["
 | |
|       silent! vunmap <buffer> ["
 | |
|     endif
 | |
|     unlet! b:match_ignorecase b:match_words b:match_skip b:did_add_maps
 | |
|   endfunc
 | |
| endif
 | |
| 
 | |
| let b:undo_ftplugin = "call VimFtpluginUndo()"
 | |
| 
 | |
| " Set 'formatoptions' to break comment lines but not other lines,
 | |
| " and insert the comment leader when hitting <CR> or using "o".
 | |
| setlocal fo-=t fo+=croql
 | |
| 
 | |
| " To allow tag lookup via CTRL-] for autoload functions, '#' must be a
 | |
| " keyword character.  E.g., for netrw#Nread().
 | |
| setlocal isk+=#
 | |
| 
 | |
| " Use :help to lookup the keyword under the cursor with K.
 | |
| setlocal keywordprg=:help
 | |
| 
 | |
| " Comments starts with # in Vim9 script.  We have to guess which one to use.
 | |
| if "\n" .. getline(1, 32)->join("\n") =~# '\n\s*vim9\%[script]\>'
 | |
|   setlocal commentstring=#\ %s
 | |
| else
 | |
|   setlocal commentstring=\"%s
 | |
| endif
 | |
| 
 | |
| " Set 'comments' to format dashed lists in comments, both in Vim9 and legacy
 | |
| " script.
 | |
| setlocal com=sO:#\ -,mO:#\ \ ,eO:##,:#\\\ ,:#,sO:\"\ -,mO:\"\ \ ,eO:\"\",:\"\\\ ,:\"
 | |
| 
 | |
| " set 'include' to recognize import commands
 | |
| setlocal include=\\v^\\s*import\\s*(autoload)?
 | |
| 
 | |
| " set 'define' to recognize export commands
 | |
| setlocal define=\\v^\\s*export\\s*(def\|const\|var\|final)
 | |
| 
 | |
| " Format comments to be up to 78 characters long
 | |
| if &tw == 0
 | |
|   setlocal tw=78
 | |
| endif
 | |
| 
 | |
| if !exists("no_plugin_maps") && !exists("no_vim_maps")
 | |
|   let b:did_add_maps = 1
 | |
| 
 | |
|   " Move around functions.
 | |
|   nnoremap <silent><buffer> [[ m':call search('^\s*\(fu\%[nction]\\|\(export\s\+\)\?def\)\>', "bW")<CR>
 | |
|   vnoremap <silent><buffer> [[ m':<C-U>exe "normal! gv"<Bar>call search('^\s*\(fu\%[nction]\\|\(export\s\+\)\?def\)\>', "bW")<CR>
 | |
|   nnoremap <silent><buffer> ]] m':call search('^\s*\(fu\%[nction]\\|\(export\s\+\)\?def\)\>', "W")<CR>
 | |
|   vnoremap <silent><buffer> ]] m':<C-U>exe "normal! gv"<Bar>call search('^\s*\(fu\%[nction]\\|\(export\s\+\)\?def\)\>', "W")<CR>
 | |
|   nnoremap <silent><buffer> [] m':call search('^\s*end\(f\%[unction]\\|\(export\s\+\)\?def\)\>', "bW")<CR>
 | |
|   vnoremap <silent><buffer> [] m':<C-U>exe "normal! gv"<Bar>call search('^\s*end\(f\%[unction]\\|\(export\s\+\)\?def\)\>', "bW")<CR>
 | |
|   nnoremap <silent><buffer> ][ m':call search('^\s*end\(f\%[unction]\\|\(export\s\+\)\?def\)\>', "W")<CR>
 | |
|   vnoremap <silent><buffer> ][ m':<C-U>exe "normal! gv"<Bar>call search('^\s*end\(f\%[unction]\\|\(export\s\+\)\?def\)\>', "W")<CR>
 | |
| 
 | |
|   " Move around comments
 | |
|   nnoremap <silent><buffer> ]" :call search('\%(^\s*".*\n\)\@<!\%(^\s*"\)', "W")<CR>
 | |
|   vnoremap <silent><buffer> ]" :<C-U>exe "normal! gv"<Bar>call search('\%(^\s*".*\n\)\@<!\%(^\s*"\)', "W")<CR>
 | |
|   nnoremap <silent><buffer> [" :call search('\%(^\s*".*\n\)\%(^\s*"\)\@!', "bW")<CR>
 | |
|   vnoremap <silent><buffer> [" :<C-U>exe "normal! gv"<Bar>call search('\%(^\s*".*\n\)\%(^\s*"\)\@!', "bW")<CR>
 | |
| endif
 | |
| 
 | |
| " Let the matchit plugin know what items can be matched.
 | |
| if exists("loaded_matchit")
 | |
|   let b:match_ignorecase = 0
 | |
|   " "func" can also be used as a type:
 | |
|   "   var Ref: func
 | |
|   " or to list functions:
 | |
|   "   func name
 | |
|   " require a parenthesis following, then there can be an "endfunc".
 | |
|   let b:match_words =
 | |
| 	\ '\<\%(fu\%[nction]\|def\)!\=\s\+\S\+\s*(:\%(\%(^\||\)\s*\)\@<=\<retu\%[rn]\>:\%(\%(^\||\)\s*\)\@<=\<\%(endf\%[unction]\|enddef\)\>,' ..
 | |
| 	\ '\<\%(wh\%[ile]\|for\)\>:\%(\%(^\||\)\s*\)\@<=\<brea\%[k]\>:\%(\%(^\||\)\s*\)\@<=\<con\%[tinue]\>:\%(\%(^\||\)\s*\)\@<=\<end\%(w\%[hile]\|fo\%[r]\)\>,' ..
 | |
| 	\ '\<if\>:\%(\%(^\||\)\s*\)\@<=\<el\%[seif]\>:\%(\%(^\||\)\s*\)\@<=\<en\%[dif]\>,' ..
 | |
| 	\ '{:},' ..
 | |
| 	\ '\<try\>:\%(\%(^\||\)\s*\)\@<=\<cat\%[ch]\>:\%(\%(^\||\)\s*\)\@<=\<fina\%[lly]\>:\%(\%(^\||\)\s*\)\@<=\<endt\%[ry]\>,' ..
 | |
| 	\ '\<aug\%[roup]\s\+\%(END\>\)\@!\S:\<aug\%[roup]\s\+END\>,' ..
 | |
| 	\ '\<class\>:\<endclass\>,' ..
 | |
| 	\ '\<inte\%[rface]\>:\<endinterface\>,' ..
 | |
| 	\ '\<enu\%[m]\>:\<endenum\>,'
 | |
| 
 | |
|   " Ignore syntax region commands and settings, any 'en*' would clobber
 | |
|   " if-endif.
 | |
|   " - set spl=de,en
 | |
|   " - au! FileType javascript syntax region foldBraces start=/{/ end=/}/ …
 | |
|   " Also ignore here-doc and dictionary keys (vimVar).
 | |
|   let b:match_skip = 'synIDattr(synID(line("."), col("."), 1), "name")
 | |
| 	\ =~? "comment\\|string\\|vimSynReg\\|vimSet\\|vimLetHereDoc\\|vimVar"'
 | |
| endif
 | |
| 
 | |
| let &cpo = s:cpo_save
 | |
| unlet s:cpo_save
 | |
| 
 | |
| " removed this, because 'cpoptions' is a global option.
 | |
| " setlocal cpo+=M		" makes \%( match \)
 |