Skip to content

automatically set source_path to fallback educated guess #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

automatically set source_path to fallback educated guess #5

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
48277a9
automatically set undocumented source_path with fallback
Konfekt Mar 20, 2025
8bd417a
jump directly to JDK source file
Konfekt Mar 20, 2025
a2ae5dd
search for javac (JDK) instead of java (possibly JRE)
Konfekt Mar 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 28 additions & 6 deletions runtime/ftplugin/java.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,21 @@ unlet! s:zip_func_upgradable

"""" STRIVE TO REMAIN COMPATIBLE FOR AT LEAST VIM 7.0.

" Documented in ":help ft-java-plugin".
if !exists("g:ftplugin_java_source_path")
if exists('$SOURCEPATH')
let g:ftplugin_java_source_path = $SOURCEPATH
elseif exists('$JAVA_HOME')
let g:ftplugin_java_source_path = $JAVA_HOME . '/lib/src.zip'
else
let s:ftplugin_java_source_path = simplify(fnamemodify(resolve(exepath('javac')), ':p:h') . '/../lib/src.zip')
let g:ftplugin_java_source_path = filereadable(s:ftplugin_java_source_path) ? s:ftplugin_java_source_path : ""
unlet s:ftplugin_java_source_path
endif
endif

if exists("g:ftplugin_java_source_path") &&
\ type(g:ftplugin_java_source_path) == type("")
\ type(g:ftplugin_java_source_path) == type("") &&
\ g:ftplugin_java_source_path !=# ""
if filereadable(g:ftplugin_java_source_path)
if exists("#zip") &&
\ g:ftplugin_java_source_path =~# '.\.\%(jar\|zip\)$'
Expand All @@ -55,8 +67,13 @@ if exists("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])
let fname = tr(v:fname, '.', '/') .. '.java'
let ffname = findfile(fname)
if filereadable(ffname)
return ffname
else
return 'zipfile://' . get(s:zip_files, bufnr('%'), s:zip_files[0]) . '::java.base/' . fname
endif
endfunction

" E120 for "inex=s:JavaFileTypeZipFile()" before v8.2.3900.
Expand Down Expand Up @@ -365,8 +382,13 @@ 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])
const fname = tr(v:fname, '.', '/') .. '.java'
const ffname = findfile(fname)
if filereadable(ffname)
return ffname
else
return 'zipfile://' .. get(s:zip_files, bufnr('%'), s:zip_files[0]) .. '::java.base/' .. fname
endif
enddef

setlocal includeexpr=s:JavaFileTypeZipFile()
Expand Down