fix: backward compatible modeling of try-with-resource #4625
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
monperrus
changed the title
monperrus
changed the title
|
the diff is now clean here |
MartinWitt
approved these changes
Feb 28, 2022
| assertEquals("resource", ((CtVariable<?>) ctResource).getSimpleName()); | ||
|
|
||
| // contract: pretty-printing of existing resources works | ||
| assertEquals("try (resource) {"+System.getProperty("line.separator")+"}", tryStmt.toString()); |
There was a problem hiding this comment.
You could use the LinespeparatorExtension here and \n in the testcase.
| assertTrue(ctResource instanceof CtVariableRead); | ||
| assertEquals("resource", ((CtVariableRead<?>) ctResource).getVariable().getSimpleName()); | ||
| assertTrue(ctResource instanceof CtVariable); | ||
| assertEquals("resource", ((CtVariable<?>) ctResource).getSimpleName()); |
There was a problem hiding this comment.
Convert the spaces to tabs here. We are not super strict with formatting in testcases but a method should either use spaces or tabs, not both
| // we have to find it manually | ||
| for (ASTPair pair: this.jdtTreeBuilder.getContextBuilder().stack) { | ||
| final List<CtLocalVariable> variables = pair.element.getElements(new TypeFilter<>(CtLocalVariable.class)); | ||
| if (variables.size() > 0) { |
There was a problem hiding this comment.
Suggested change
| if (variables.size() > 0) { | |
| if (!variables.isEmpty()) { |
| tryWithResource.addResource((CtLocalVariable) child); | ||
| } else if (child instanceof CtVariableRead) { | ||
| // special case of the resource being declared before | ||
| final CtVariableReference<?> variableRef = ((CtVariableRead<?>) child).getVariable(); |
There was a problem hiding this comment.
Are there any reasons for the final modifiers, especially for Collections?
There was a problem hiding this comment.
the IDE puts it automatically, and it does not hurt.
|
Thanks fixed all comments |
MartinWitt
changed the title
|
thanks @monperrus |
|
I confirm that the regression identified in NpeFix is solved: https://ci.inria.fr/sos/job/npefix/1861/ |
raghav-deepsource
pushed a commit
to DeepSourceCorp/spoon
that referenced
this pull request
Apr 5, 2022
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.
An iteration about try-with-resources on top of #4371.
Before the resource declaration was a CtVariableRead, which is not natural and breaking.
Now a resource is an implicit variable declaration. The main advantage is that it is fully backward compatible (hence we would fix https://ci.inria.fr/sos/job/npefix/)
Plus, I've added a test on pretty-printing.