mirror of
				https://github.com/amix/vimrc
				synced 2025-10-31 14:43:35 +08:00 
			
		
		
		
	Updated plugins
This commit is contained in:
		| @ -7,6 +7,7 @@ call ale#Set('java_eclipselsp_path', ale#path#Simplify($HOME . '/eclipse.jdt.ls' | ||||
| call ale#Set('java_eclipselsp_config_path', '') | ||||
| call ale#Set('java_eclipselsp_workspace_path', '') | ||||
| call ale#Set('java_eclipselsp_executable', 'java') | ||||
| call ale#Set('java_eclipselsp_javaagent', '') | ||||
|  | ||||
| function! ale_linters#java#eclipselsp#Executable(buffer) abort | ||||
|     return ale#Var(a:buffer, 'java_eclipselsp_executable') | ||||
| @ -100,12 +101,30 @@ function! ale_linters#java#eclipselsp#WorkspacePath(buffer) abort | ||||
|     return ale#path#Dirname(ale#java#FindProjectRoot(a:buffer)) | ||||
| endfunction | ||||
|  | ||||
| function! ale_linters#java#eclipselsp#Javaagent(buffer) abort | ||||
|     let l:rets = [] | ||||
|     let l:raw = ale#Var(a:buffer, 'java_eclipselsp_javaagent') | ||||
|  | ||||
|     if empty(l:raw) | ||||
|         return '' | ||||
|     endif | ||||
|  | ||||
|     let l:jars = split(l:raw) | ||||
|  | ||||
|     for l:jar in l:jars | ||||
|         call add(l:rets, ale#Escape('-javaagent:' . l:jar)) | ||||
|     endfor | ||||
|  | ||||
|     return join(l:rets, ' ') | ||||
| endfunction | ||||
|  | ||||
| function! ale_linters#java#eclipselsp#Command(buffer, version) abort | ||||
|     let l:path = ale#Var(a:buffer, 'java_eclipselsp_path') | ||||
|  | ||||
|     let l:executable = ale_linters#java#eclipselsp#Executable(a:buffer) | ||||
|  | ||||
|     let l:cmd = [ ale#Escape(l:executable), | ||||
|     \ ale_linters#java#eclipselsp#Javaagent(a:buffer), | ||||
|     \ '-Declipse.application=org.eclipse.jdt.ls.core.id1', | ||||
|     \ '-Dosgi.bundles.defaultStartLevel=4', | ||||
|     \ '-Declipse.product=org.eclipse.jdt.ls.core.product', | ||||
|  | ||||
| @ -6,6 +6,7 @@ let s:classpath_sep = has('unix') ? ':' : ';' | ||||
| call ale#Set('java_javac_executable', 'javac') | ||||
| call ale#Set('java_javac_options', '') | ||||
| call ale#Set('java_javac_classpath', '') | ||||
| call ale#Set('java_javac_sourcepath', '') | ||||
|  | ||||
| function! ale_linters#java#javac#RunWithImportPaths(buffer) abort | ||||
|     let l:command = '' | ||||
| @ -40,10 +41,15 @@ endfunction | ||||
| function! s:BuildClassPathOption(buffer, import_paths) abort | ||||
|     " Filter out lines like [INFO], etc. | ||||
|     let l:class_paths = filter(a:import_paths[:], 'v:val !~# ''[''') | ||||
|     call extend( | ||||
|     \   l:class_paths, | ||||
|     \   split(ale#Var(a:buffer, 'java_javac_classpath'), s:classpath_sep), | ||||
|     \) | ||||
|     let l:cls_path = ale#Var(a:buffer, 'java_javac_classpath') | ||||
|  | ||||
|     if !empty(l:cls_path) && type(l:cls_path) is v:t_string | ||||
|         call extend(l:class_paths, split(l:cls_path, s:classpath_sep)) | ||||
|     endif | ||||
|  | ||||
|     if !empty(l:cls_path) && type(l:cls_path) is v:t_list | ||||
|         call extend(l:class_paths, l:cls_path) | ||||
|     endif | ||||
|  | ||||
|     return !empty(l:class_paths) | ||||
|     \   ? '-cp ' . ale#Escape(join(l:class_paths, s:classpath_sep)) | ||||
| @ -79,6 +85,27 @@ function! ale_linters#java#javac#GetCommand(buffer, import_paths, meta) abort | ||||
|         endif | ||||
|     endif | ||||
|  | ||||
|     let l:source_paths = [] | ||||
|     let l:source_path = ale#Var(a:buffer, 'java_javac_sourcepath') | ||||
|  | ||||
|     if !empty(l:source_path) && type(l:source_path) is v:t_string | ||||
|         let l:source_paths = split(l:source_path, s:classpath_sep) | ||||
|     endif | ||||
|  | ||||
|     if !empty(l:source_path) && type(l:source_path) is v:t_list | ||||
|         let l:source_paths = l:source_path | ||||
|     endif | ||||
|  | ||||
|     if !empty(l:source_paths) | ||||
|         for l:path in l:source_paths | ||||
|             let l:sp_path = ale#path#FindNearestDirectory(a:buffer, l:path) | ||||
|  | ||||
|             if !empty(l:sp_path) | ||||
|                 call add(l:sp_dirs, l:sp_path) | ||||
|             endif | ||||
|         endfor | ||||
|     endif | ||||
|  | ||||
|     if !empty(l:sp_dirs) | ||||
|         let l:sp_option = '-sourcepath ' | ||||
|         \   . ale#Escape(join(l:sp_dirs, s:classpath_sep)) | ||||
|  | ||||
		Reference in New Issue
	
	Block a user
	 Amir
					Amir