Skip to content
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.

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

Allow jumping to java source when the jar is already avaible in classpath. #607

Merged
merged 2 commits into from
Sep 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ deps:
rm -rf lua/nfnl fnl/nfnl
cp -r deps/nfnl/lua/nfnl lua/nfnl
mkdir -p fnl/nfnl
cp deps/nfnl/fnl/nfnl/macros* -r fnl/nfnl
cp -r deps/nfnl/fnl/nfnl/macros* fnl/nfnl

sponsors:
echo "[ ;; Generated by: make sponsors" > fnl/conjure/sponsors.fnl
Expand Down
13 changes: 7 additions & 6 deletions fnl/conjure/client/clojure/nrepl/action.fnl
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,13 @@
["; Multiple candidates found"]
(a.map #(.. $1 "/" opts.code) (a.keys info.candidates))))

(and info.file info.line)
(let [column (or info.column 1)
path (nrepl->nvim-path info.file)]
(editor.go-to path info.line column)
(log.append [(.. "; " path " [" info.line " " column "]")]
{:suppress-hud? true}))

info.javadoc
(log.append ["; Can't open source, it's Java"
(.. "; " info.javadoc)])
Expand All @@ -218,12 +225,6 @@
(log.append ["; Can't open source, it's a special form"
(when info.url (.. "; " info.url))])

(and info.file info.line)
(let [column (or info.column 1)
path (nrepl->nvim-path info.file)]
(editor.go-to path info.line column)
(log.append [(.. "; " path " [" info.line " " column "]")]
{:suppress-hud? true}))

(log.append ["; Unsupported target"
(.. "; " (a.pr-str info))])))))))
Expand Down
10 changes: 5 additions & 5 deletions lua/conjure/client/clojure/nrepl/action.lua

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.