marc/ale
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

javac: Don't assume src/main/java always exists

Browse source 
Some projects I have only have src/test/java (no /src/main/java), which
seemed to break some incorrect assumptions the linter had.
This commit is contained in:
Ryan Campbell 2018-12-20 15:37:31 -07:00
parent fefc093e70
commit 4fc27f099b
No known key found for this signature in database
GPG key ID: 0BEF6FA71FC3FA10
3 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ale_linters/java/javac.vim
View file

@ -55,17 +55,16 @@ function! ale_linters#java#javac#GetCommand(buffer, import_paths) abort
if isdirectory(l:jaxb_dir) if isdirectory(l:jaxb_dir)
call add(l:sp_dirs, l:jaxb_dir) call add(l:sp_dirs, l:jaxb_dir)
endif endif
endif
" Automatically include the test directory, but only for test code. " Automatically include the test directory, but only for test code.
if expand('#' . a:buffer . ':p') =~? '\vsrc[/\\]test[/\\]java' if expand('#' . a:buffer . ':p') =~? '\vsrc[/\\]test[/\\]java'
let l:test_dir = fnamemodify(l:src_dir, ':h:h:h') let l:test_dir = ale#path#FindNearestDirectory(a:buffer, 'src/test/java')
\ . (has('win32') ? '\test\java\' : '/test/java/')
if isdirectory(l:test_dir) if isdirectory(l:test_dir)
call add(l:sp_dirs, l:test_dir) call add(l:sp_dirs, l:test_dir)
endif endif
endif endif
endif
if !empty(l:sp_dirs) if !empty(l:sp_dirs)
let l:sp_option = '-sourcepath ' let l:sp_option = '-sourcepath '

0
test/command_callback/java_paths_no_main/src/test/java/com/something/dummy Normal file
View file

12
test/command_callback/test_javac_command_callback.vader
View file

@ -166,3 +166,15 @@ Execute(The javac callback should include src/main/jaxb when available):
\ ale#path#Simplify(g:dir . '/java_paths_with_jaxb/src/main/jaxb/'), \ ale#path#Simplify(g:dir . '/java_paths_with_jaxb/src/main/jaxb/'),
\ ], g:cp_sep)) \ ], g:cp_sep))
\ . ' -d ' . ale#Escape('TEMP_DIR') . ' %t' \ . ' -d ' . ale#Escape('TEMP_DIR') . ' %t'
Execute(The javac callback should add -sourcepath even if src/java/main doesn't exist):
call ale#engine#Cleanup(bufnr(''))
call ale#test#SetFilename('java_paths_no_main/src/test/java/com/something/dummy.java')
call ale#engine#InitBufferInfo(bufnr(''))
AssertLinter 'javac',
\ ale#path#CdString(expand('%:p:h')) . ale#Escape('javac') . ' -Xlint'
\ . ' -sourcepath ' . ale#Escape(join([
\ ale#path#Simplify(g:dir . '/java_paths_no_main/src/test/java/'),
\ ], g:cp_sep))
\ . ' -d ' . ale#Escape('TEMP_DIR') . ' %t'