[GITHUB-9056] Using sharp(er) classpath when rename refactoring. #9069
+318
−72
Conversation
This file contains hidden or 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
lahodaj
added
the
Java
mbien
added
the
ci:dev-build
Member
|
can confirm that this fixes the issue, I could rename the (heavily used) utility method with all projects open. |
mbien
reviewed
Jan 14, 2026
Comment on lines
-370
to
+371
| switch (p) { | ||
| case PRECHECK: | ||
| case FASTCHECKPARAMETERS: | ||
| return JavaSource.forFileObject(docTreePathHandle != null? docTreePathHandle.getTreePathHandle().getFileObject() | ||
| : treePathHandle.getFileObject()); | ||
| case PREPARE: | ||
| case CHECKPARAMETERS: | ||
| if(treePathHandle != null && treePathHandle.getKind() == Tree.Kind.LABELED_STATEMENT) { | ||
| return JavaSource.forFileObject(treePathHandle.getFileObject()); | ||
| } | ||
| ClasspathInfo cpInfo = getClasspathInfo(refactoring); | ||
| JavaSource source = JavaSource.create(cpInfo, docTreePathHandle != null? docTreePathHandle.getTreePathHandle().getFileObject() | ||
| : treePathHandle.getFileObject()); | ||
| return source; | ||
|
|
||
| } | ||
| throw new IllegalStateException(); | ||
| return JavaSource.forFileObject(docTreePathHandle != null? docTreePathHandle.getTreePathHandle().getFileObject() | ||
| : treePathHandle.getFileObject()); |
Member
There was a problem hiding this comment.
i suppose this used to be an optimization to create a smaller CP for inline rename?
i tried to look through history and the switch slowly grew over time
emilianbold/netbeans-releases@0a558e4
emilianbold/netbeans-releases@f2d147e
Contributor
Author
There was a problem hiding this comment.
TBH, I am not sure what was the idea. I see the label rename refactoring probably does not have tests, I'll see if there's a meaningful way to add some.
mbien
approved these changes
Jan 21, 2026
Contributor
Author
|
Ok. If there are no objections, I'll merge. Of course, if something breaks (too much) anyone should feel free to revert. Thanks!! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
The Java refactoring is sometimes using class path (
ClasspathInfo) that is, to me, extremely weird. In the specific case of #9056, theClasspathInfoused to processGspIndenterdoes not in some cases contain thelexermodule, while thegroovy/groovy.gspdefinitely lists it as a dependency.The consequence of that is that there are compile-time errors in the file(s) with this broken class path. Sometimes, it may lead to "catastrophic" failures like:
https://bugs.openjdk.org/browse/JDK-8373094
but even if it does not, wrong class path is likely to lead to weird effects. Like, in the test for the PR,
testComplexRename1, insidemain.Main, not onlytest(Side)will be renamed, but alsotest(String)will be renamed with the current state, as the classpath when analyzingmain.maindoes not containside.The goal of this PR is to use class path that is more sensible for the rename refactoring.
^Add meaningful description above
Click to collapse/expand PR instructions
By opening a pull request you confirm that, unless explicitly stated otherwise, the changes -
Please make sure (eg.
git log) that all commits have a valid name and email address for you in the Author field.If you're a first time contributor, see the Contributing guidelines for more information.
If you're a committer, please label the PR before pressing "Create pull request" so that the right test jobs can run.
PR approval and merge checklist:
If this PR targets the delivery branch: don't merge. (full wiki article)