Fix bug #980 with fully qualified names and shadowed variables #1026
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
…ith an or instead of an and. Now the test is failing, proof that the assertion is checked :)
… a local variable in the same block or by a field (or a variable in another block). First detection implemented but patch not satisfying.
…sing autoimport
…rus/spoon into martin" This reverts commit 2609284, reversing changes made to 49d6e68.
…operties. Some choices have been done concerning some set methods in order to pass the test we should discuss.
Fix conflicts by solving imports.
… set to true or when it is set to false. When set to false, the scanner will detect name conflict and automatically import necessary types.
Solve conflict.
…g on CtElement (default behaviour until now).
monperrus
reviewed
Dec 7, 2016
| * A scanner dedicated to import only the necessary packages, @see spoon.test.variable.AccessFullyQualifiedTest | ||
| * | ||
| */ | ||
| public class ImportScannerWithoutAllImports extends ImportScannerImpl implements ImportScanner { |
There was a problem hiding this comment.
rename to MinimalImportScanner?
monperrus
reviewed
Dec 7, 2016
| @@ -37,63 +37,63 @@ | |||
| import org.eclipse.jdt.internal.compiler.ast.TypeReference; | |||
There was a problem hiding this comment.
In fact the file changed a lot because my first patch was in this file which caused the checkstyle mess with imports... Not sure how to remove file from the PR properly.
monperrus
reviewed
Dec 7, 2016
| @@ -58,6 +58,9 @@ | |||
| @Override | |||
| public <C extends CtTypedElement> C setType(CtTypeReference<T> type) { | |||
| if (type != null) { | |||
| type.setParent(this); | |||
There was a problem hiding this comment.
I merged with files of the previous PR to avoid a file conflict.
tdurieux
reviewed
Dec 7, 2016
| CtFieldReference parentType = (CtFieldReference) parent; | ||
| String qualifiedName = parentType.getQualifiedName(); | ||
|
|
||
| String[] splittedName = qualifiedName.split("(\\.|#)"); |
There was a problem hiding this comment.
Why do you need to split the qualified name?
There was a problem hiding this comment.
To detect names like spoon.launcher and avoid to detect spoonLauncher.
monperrus
reviewed
Dec 7, 2016
| CtFieldReference parentType = (CtFieldReference) parent; | ||
| String qualifiedName = parentType.getQualifiedName(); | ||
|
|
||
| String[] splittedName = qualifiedName.split("(\\.|#)"); |
monperrus
reviewed
Dec 7, 2016
| spoon.addInputResource("src/test/java/spoon/test/variable/testclasses/BurritosFielded.java"); | ||
| String output = "target/spooned-" + this.getClass().getSimpleName()+"-Field/"; | ||
| spoon.setSourceOutputDirectory(output); | ||
| spoon.run(); |
There was a problem hiding this comment.
for all replace run by buildModel and then filter + strong assert
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.
Create a new ImportScanner to be used when autoimport is set to false: then all types are checked if they need to be imported in order to avoid shadowed variable.
Tests has been added to check multiple cases.