mirror of
				https://github.com/neovim/neovim.git
				synced 2025-11-04 01:34:25 +00: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: vim/vim#14843
0a0830624a
Co-authored-by: Riley Bruins <ribru17@hotmail.com>
		
	
		
			
				
	
	
		
			106 lines
		
	
	
		
			3.2 KiB
		
	
	
	
		
			VimL
		
	
	
	
	
	
			
		
		
	
	
			106 lines
		
	
	
		
			3.2 KiB
		
	
	
	
		
			VimL
		
	
	
	
	
	
" Vim filetype plugin file
 | 
						|
" Language:		Java
 | 
						|
" Maintainer:		Aliaksei Budavei <0x000c70 AT gmail DOT com>
 | 
						|
" Former Maintainer:	Dan Sharp
 | 
						|
" Repository:		https://github.com/zzzyxwvut/java-vim.git
 | 
						|
" Last Change:		2024 Apr 18
 | 
						|
"			2024 Jan 14 by Vim Project (browsefilter)
 | 
						|
"			2024 May 23 by Riley Bruins <ribru17@gmail.com> ('commentstring')
 | 
						|
 | 
						|
if exists("b:did_ftplugin") | finish | endif
 | 
						|
let b:did_ftplugin = 1
 | 
						|
 | 
						|
" Make sure the continuation lines below do not cause problems in
 | 
						|
" compatibility mode.
 | 
						|
let s:save_cpo = &cpo
 | 
						|
set cpo-=C
 | 
						|
 | 
						|
" For filename completion, prefer the .java extension over the .class
 | 
						|
" extension.
 | 
						|
set suffixes+=.class
 | 
						|
 | 
						|
" Enable gf on import statements.  Convert . in the package
 | 
						|
" name to / and append .java to the name, then search the path.
 | 
						|
setlocal includeexpr=substitute(v:fname,'\\.','/','g')
 | 
						|
setlocal suffixesadd=.java
 | 
						|
 | 
						|
" Clean up in case this file is sourced again.
 | 
						|
unlet! s:zip_func_upgradable
 | 
						|
 | 
						|
" Documented in ":help ft-java-plugin".
 | 
						|
if exists("g:ftplugin_java_source_path") &&
 | 
						|
		\ type(g:ftplugin_java_source_path) == type("")
 | 
						|
    if filereadable(g:ftplugin_java_source_path)
 | 
						|
	if exists("#zip") &&
 | 
						|
		    \ g:ftplugin_java_source_path =~# '.\.\%(jar\|zip\)$'
 | 
						|
	    if !exists("s:zip_files")
 | 
						|
		let s:zip_files = {}
 | 
						|
	    endif
 | 
						|
 | 
						|
	    let s:zip_files[bufnr('%')] = g:ftplugin_java_source_path
 | 
						|
	    let s:zip_files[0] = g:ftplugin_java_source_path
 | 
						|
	    let s:zip_func_upgradable = 1
 | 
						|
 | 
						|
	    function! JavaFileTypeZipFile() abort
 | 
						|
		let @/ = substitute(v:fname, '\.', '\\/', 'g') . '.java'
 | 
						|
		return get(s:zip_files, bufnr('%'), s:zip_files[0])
 | 
						|
	    endfunction
 | 
						|
 | 
						|
	    " E120 for "inex=s:JavaFileTypeZipFile()" before v8.2.3900.
 | 
						|
	    setlocal includeexpr=JavaFileTypeZipFile()
 | 
						|
	    setlocal suffixesadd<
 | 
						|
	endif
 | 
						|
    else
 | 
						|
	let &l:path = g:ftplugin_java_source_path . ',' . &l:path
 | 
						|
    endif
 | 
						|
endif
 | 
						|
 | 
						|
" Set 'formatoptions' to break comment lines but not other lines,
 | 
						|
" and insert the comment leader when hitting <CR> or using "o".
 | 
						|
setlocal formatoptions-=t formatoptions+=croql
 | 
						|
 | 
						|
" Set 'comments' to format dashed lists in comments. Behaves just like C.
 | 
						|
setlocal comments& comments^=sO:*\ -,mO:*\ \ ,exO:*/
 | 
						|
 | 
						|
setlocal commentstring=//\ %s
 | 
						|
 | 
						|
" Change the :browse e filter to primarily show Java-related files.
 | 
						|
if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter")
 | 
						|
    let  b:browsefilter="Java Files (*.java)\t*.java\n" .
 | 
						|
		\	"Properties Files (*.prop*)\t*.prop*\n" .
 | 
						|
		\	"Manifest Files (*.mf)\t*.mf\n"
 | 
						|
    if has("win32")
 | 
						|
	let b:browsefilter .= "All Files (*.*)\t*\n"
 | 
						|
    else
 | 
						|
	let b:browsefilter .= "All Files (*)\t*\n"
 | 
						|
    endif
 | 
						|
endif
 | 
						|
 | 
						|
" Undo the stuff we changed.
 | 
						|
let b:undo_ftplugin = "setlocal suffixes< suffixesadd<" .
 | 
						|
		\     " formatoptions< comments< commentstring< path< includeexpr<" .
 | 
						|
		\     " | unlet! b:browsefilter"
 | 
						|
 | 
						|
" See ":help vim9-mix".
 | 
						|
if !has("vim9script")
 | 
						|
    let &cpo = s:save_cpo
 | 
						|
    unlet s:save_cpo
 | 
						|
    finish
 | 
						|
endif
 | 
						|
 | 
						|
if exists("s:zip_func_upgradable")
 | 
						|
    delfunction! JavaFileTypeZipFile
 | 
						|
 | 
						|
    def! s:JavaFileTypeZipFile(): string
 | 
						|
	@/ = substitute(v:fname, '\.', '\\/', 'g') .. '.java'
 | 
						|
	return get(zip_files, bufnr('%'), zip_files[0])
 | 
						|
    enddef
 | 
						|
 | 
						|
    setlocal includeexpr=s:JavaFileTypeZipFile()
 | 
						|
    setlocal suffixesadd<
 | 
						|
endif
 | 
						|
 | 
						|
" Restore the saved compatibility options.
 | 
						|
let &cpo = s:save_cpo
 | 
						|
unlet s:save_cpo
 |