Choose the inner-most scalac-plugin.xml resource during plugin resolution #8322
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
|
/nothingtoseehere (travis build timed out, jenkins is happy) |
retronym
commented
Aug 12, 2019
| loader.getResource(PluginXML) match { | ||
| case null => Failure(new MissingPluginException(path)) | ||
| case url => | ||
| loader.getResources(PluginXML).asScala.toList.lastOption match { |
There was a problem hiding this comment.
This is a second line of defence, in case a Global subclass overrides findPluginClassloader and doesn't special case parent delegation for plugin.xml as I've done in Plugins.scala.
|
Are you planning to write tests that exercise this? This change should be easily portable to do but I'm not comfortable doing that without tests |
|
@smarter I did attempt to replicate the classloader setup in a test case but couldn't find a decent way to do it without creating new test infrastructure. |
retronym
added a commit
to retronym/scala
that referenced
this pull request
Aug 19, 2019
This commit reverts part of the scala#8322 I recently changed to using the last entry from getResources to avoid parent classloader delegation, but this leads to unwanted results if the plugin classpath itself contains multiple `scalac-plugin.xml` resources and wants the compiler to choose the first. I have _not_ reverted the other change in scala#8322 which overrides `getResource` to avoid parent delegation for `scalac-plugin.xml`. I have documented the `findPluginClassLoader` extension point with instructions to do the same.
|
I've had to tweak this in #8345 to cope with plugin classpaths that themselves contain multiple |
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.
Fixes scala/bug#11666