review: fix: Make CtFieldRead inherit from CtResource #5860
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
I-Al-Istannen
force-pushed
the
fix/field-in-try-with-resources
branch
4 times, most recently
from
4e87310
to
d644e27
Compare
I-Al-Istannen
changed the title
I-Al-Istannen
changed the title
Fields are allowed in try-with-resources statements now, so spoon should model this case.
…pe for CtResource This allows us to correctly model try-with-resources only taking a field, parameter, catch variable or local variable reference.
I-Al-Istannen
force-pushed
the
fix/field-in-try-with-resources
branch
from
bc7474e
to
a5b4c1a
Compare
MartinWitt
approved these changes
Jun 25, 2024
Comment on lines
-1109
to
-1130
| } else if (child instanceof CtVariableRead) { | ||
| // special case of the resource being declared before | ||
| final CtVariableReference<?> variableRef = ((CtVariableRead<?>) child).getVariable(); | ||
| if (variableRef.getDeclaration() != null) { | ||
| // getDeclaration works | ||
| tryWithResource.addResource((CtResource<?>) variableRef.getDeclaration().clone().setImplicit(true)); | ||
| } else { | ||
| // we have to find it manually | ||
| for (ASTPair pair: this.jdtTreeBuilder.getContextBuilder().getAllContexts()) { | ||
| final List<CtLocalVariable> variables = pair.element().getElements(new TypeFilter<>(CtLocalVariable.class)); | ||
| for (CtLocalVariable v: variables) { | ||
| if (v.getSimpleName().equals(variableRef.getSimpleName())) { | ||
| // we found the resource | ||
| // we clone it in order to comply with the contract of being a tree | ||
| final CtLocalVariable clone = v.clone(); | ||
| clone.setImplicit(true); | ||
| tryWithResource.addResource(clone); | ||
| break; | ||
| } | ||
| } | ||
| } | ||
| } |
There was a problem hiding this comment.
I will miss this easy to understand and maintainable code.
Comment on lines
+569
to
+575
| private static CtModel createModelFromString(String code) { | ||
| Launcher launcher = new Launcher(); | ||
| launcher.getEnvironment().setComplianceLevel(21); | ||
| launcher.getEnvironment().setShouldCompile(true); | ||
| launcher.addInputResource(new VirtualFile(code)); | ||
| return launcher.buildModel(); | ||
| } |
There was a problem hiding this comment.
One day, we will have a single method for this :(
There was a problem hiding this comment.
And other lies I tell myself? despair
|
This is technically a breaking change (though I would hope the breakage isn't too much). The old model with |
|
@SirYwell ping |
1 similar comment
|
@SirYwell ping |
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.
Fields are allowed in try-with-resources statements now, so spoon should model this case. Before this patch, only
CtLocalVariableimplementedCtResource.