-
-
Notifications
You must be signed in to change notification settings - Fork 1.5k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[java] Name disambiguation in annotations #2665
Merged
Merged
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
Generated by 🚫 Danger |
adangel
reviewed
Jul 30, 2020
pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAnnotation.java
Show resolved
Hide resolved
adangel
reviewed
Jul 30, 2020
pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTThrowStatement.java
Show resolved
Hide resolved
adangel
reviewed
Jul 30, 2020
...ava/src/main/java/net/sourceforge/pmd/lang/java/rule/internal/AnnotationSuppressionUtil.java
Show resolved
Hide resolved
adangel
approved these changes
Jul 30, 2020
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'll make the changes myself when merging.
adangel
added a commit
that referenced
this pull request
Jul 30, 2020
oowekyala
commented
Jul 30, 2020
} | ||
|
||
fun assertNoError(t: ASTClassOrInterfaceType) { | ||
val err = logger.errors[SemanticChecksLogger.MALFORMED_GENERIC_TYPE]?.firstOrNull { it.first == t } |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Suggested change
val err = logger.errors[SemanticChecksLogger.MALFORMED_GENERIC_TYPE]?.firstOrNull { it.first == t } | |
val err = logger.errors[SemanticChecksLogger.EXPECTED_ANNOTATION_TYPE]?.firstOrNull { it.first == t } |
adangel
added a commit
that referenced
this pull request
Jul 30, 2020
[java] Name disambiguation in annotations #2665
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.
Describe the PR
Implement name disambiguation for annotations. This is implemented by adding a ClassOrInterfaceType inside the annotation, so that the logic is reused. This means, ClassOrInterfaceType is used everywhere a type (or type name, not the same thing) is explicitly written (apart from import statements).
This also removes/deprecates some API we don't need anymore:
throw new E()
). When we have full type resolution we can just use the static type of the expression. The rule is rewritten to compare symbols for now.The validation of disambiguated types is stricter now (eg we report an error if you write
List<A, B>
)I made sure that ExceptionForFlowControl passes tests, but this will only be true when #2664 is merged
Related issues
Ready?
./mvnw clean verify
passes (checked automatically by travis)