bugfix: Use classpath jar for defining run classpath #4868
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
tgodzik
force-pushed
the
fix-java-classpath
branch
3 times, most recently
from
c8974e4
to
b0d536e
Compare
|
Opinions? Should we always add the classpath jar or add a specific case when the classpath is too long? Having it always makes the commandline much shorter. |
ckipp01
reviewed
Jan 19, 2023
metals/src/main/scala/scala/meta/internal/metals/debug/ExtendedScalaMainClass.scala
Outdated
Show resolved
Hide resolved
metals/src/main/scala/scala/meta/internal/metals/debug/ExtendedScalaMainClass.scala
Outdated
Show resolved
Hide resolved
|
|
||
| val out = Files.newOutputStream(manifestJar.toNIO) | ||
|
|
||
| Using.resource(new jar.JarOutputStream(out, manifest)) { jol => |
There was a problem hiding this comment.
Just ignore me if this doesn't make sense because in my head I was trying to think about what this looks like but was struggling with it. Since we're managing mutliple resources here should we maybe be using Using.Manager, or does that not fit here because of the jol == null check deciding what we call close() on. That's not 100% clear to me.
There was a problem hiding this comment.
+1 for answers! :D
- Shouldn't
JarOutputStreamtake care of closingout? - can constructor of
JarOutputStreamreturn null?
There was a problem hiding this comment.
- It does close
outso it's safe to only run close one one. - It can't, but it can throw.
I reworked it a bit and also wrapped it all in Try to be on the safe side.
kpodsiad
reviewed
Jan 19, 2023
metals/src/main/scala/scala/meta/internal/metals/debug/ExtendedScalaMainClass.scala
Outdated
Show resolved
Hide resolved
tgodzik
force-pushed
the
fix-java-classpath
branch
from
b0d536e
to
b0b40ad
Compare
kpodsiad
approved these changes
Jan 19, 2023
ckipp01
reviewed
Jan 20, 2023
metals/src/main/scala/scala/meta/internal/metals/debug/ExtendedScalaMainClass.scala
Outdated
Show resolved
Hide resolved
tgodzik
force-pushed
the
fix-java-classpath
branch
from
b0b40ad
to
c4443f1
Compare
Previously, we would use the classpath as string which might be too long on some systems for example on Windows. Now, we define it using jar with the classpath defined inside its manifest. This also benefits other system since it makes the path shorter. The jar will only be created once per classpath change and deleted on exit. Fixes scalameta#4827
tgodzik
force-pushed
the
fix-java-classpath
branch
from
c4443f1
to
78d1e30
Compare
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.
Previously, we would use the classpath as string which might be too long on some systems for example on Windows. Now, we define it using jar with the classpath defined inside its manifest. This also benefits other system since it makes the path shorter.
The jar will only be created once per classpath change and deleted on exit.
Fixes #4827