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

Fix javadoc in 'java.configuration.runtimes' settings #1683

Merged
merged 1 commit into from
Mar 10, 2021

Conversation

snjeza
Copy link
Contributor

@snjeza snjeza commented Mar 9, 2021

Fixes redhat-developer/vscode-java#1813

Signed-off-by: Snjezana Peco [email protected]

Copy link
Contributor

@rgrunber rgrunber left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. If a path has no scheme portion then we have to assume 'file'. Just a small change to make to logging, and then I think it's fine to merge.

uri = new URI(ResourceUtils.fixURI(uri));
return uri.toURL();
} catch (MalformedURLException | IllegalArgumentException | URISyntaxException e1) {
JavaLanguageServerPlugin.logInfo("Invalid javadoc: " + javadoc);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think with this logInfo, it would get logged twice (there's one outside the catch as well on 149). I would just remove this one and let the one below get used.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. I ran the build locally and it all passed. If it's just a random failure, feel free to merge.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Merged.

@snjeza snjeza changed the title Fix javadoc in 'java.configuration.runtimes' settings [WIP] Fix javadoc in 'java.configuration.runtimes' settings Mar 10, 2021
@snjeza snjeza changed the title [WIP] Fix javadoc in 'java.configuration.runtimes' settings Fix javadoc in 'java.configuration.runtimes' settings Mar 10, 2021
@snjeza
Copy link
Contributor Author

snjeza commented Mar 10, 2021

test this please

@snjeza snjeza merged commit 8e26f80 into eclipse-jdtls:master Mar 10, 2021
@testforstephen testforstephen added this to the Mid April 2021 milestone Apr 13, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Keep getting "Couldn't start client Language Support for Java" when opening a Java file in vscode.
3 participants