[lsp-magik] Support JAVA_HOME with trailing slash #4139
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Can this PR please get a review? |
yyoncho
reviewed
Aug 21, 2023
clients/lsp-magik.el
Outdated
| @@ -88,7 +88,8 @@ | |||
| :group `lsp-magik | |||
| :package-version '(lsp-mode . "8.0.1")) | |||
|
|
|||
| (defcustom lsp-magik-java-path (cond ((eq system-type 'windows-nt) "$JAVA_HOME/bin/java") | |||
| (defcustom lsp-magik-java-path (cond ((eq system-type 'windows-nt) (or (executable-find (expand-file-name "bin/java" (getenv "JAVA_HOME"))) | |||
There was a problem hiding this comment.
I dont like this to be executed on load time. Imagine every package to perform that on startup similar logic - it will kill lsp-mode's load time.
There was a problem hiding this comment.
What would you suggest?
There was a problem hiding this comment.
Use lambda and then lsp-resolve-value
There was a problem hiding this comment.
Like this?:
(defcustom lsp-magik-java-path (cond ((eq system-type 'windows-nt)
(lambda ()
(or (lsp-resolve-value (executable-find (expand-file-name "bin/java" (getenv "JAVA_HOME"))))
(lsp-resolve-value (executable-find "java")))))
(t "java"))
"Path of the java executable."
:type 'string
:group `lsp-magik
:package-version '(lsp-mode . "8.0.1"))
There was a problem hiding this comment.
to me, it looks like it will be better to wrap the whole thing in a lambda
There was a problem hiding this comment.
Please review the latest update
yyoncho
approved these changes
Aug 22, 2023
|
Thank you! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
If
$JAVA_HOMEends with a"/", which is the case when using OpenJDK e.a, the current code doesn't work. It would set it tobin/java. Using the new code, we addbin/javato the result of$JAVA_HOME. To work for a$JAVA_HOMEthat doesn't end with a"/", we use(expand-file-name..., which adds a"/", but only if needed.