Fixing an NPE related to an Identifier Name #1111
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
### What's done: - typos in warnings
…PE-identifier-name
### What's done: - we expected that variables can only be declared in Classes (forgot about objects)
petertrr
reviewed
Nov 9, 2021
diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/constants/Warnings.kt
Outdated
Show resolved
Hide resolved
| @@ -216,7 +194,7 @@ class IdentifierNaming(configRules: List<RulesConfig>) : DiktatRule( | |||
| }) { | |||
| // For class members also check `@property` KDoc tag. | |||
| // If we are here, then `variableName` is definitely a node from a class. | |||
There was a problem hiding this comment.
node from a class OR an object...
There was a problem hiding this comment.
also I made it NULL-safe. No more chances for an NPE here
| @@ -216,7 +194,7 @@ class IdentifierNaming(configRules: List<RulesConfig>) : DiktatRule( | |||
| }) { | |||
| // For class members also check `@property` KDoc tag. | |||
| // If we are here, then `variableName` is definitely a node from a class. | |||
| variableName.parent(CLASS)!!.findChildByType(KDOC)?.kDocTags() | |||
| variableName.parent(CLASS)?:variableName.parent(OBJECT_DECLARATION)?.findChildByType(KDOC)?.kDocTags() | |||
There was a problem hiding this comment.
Suggested change
| variableName.parent(CLASS)?:variableName.parent(OBJECT_DECLARATION)?.findChildByType(KDOC)?.kDocTags() | |
| (variableName.parent(CLASS)?:variableName.parent(OBJECT_DECLARATION))?.findChildByType(KDOC)?.kDocTags() |
?
There was a problem hiding this comment.
elvis operator has the biggest priority, I guess...
### What's done: - diktat
…/Warnings.kt Co-authored-by: Peter Trifanov <peter.trifanov@mail.ru>
### What's done: - review notes
### What's done: - review notes
… bugfix/NPE-identifier-name
petertrr
approved these changes
Nov 9, 2021
Codecov Report
@@ Coverage Diff @@
## master #1111 +/- ##
=========================================
Coverage 83.43% 83.43%
Complexity 2462 2462
=========================================
Files 102 102
Lines 6146 6146
Branches 1840 1840
=========================================
Hits 5128 5128
Misses 274 274
Partials 744 744
Flags with carried forward coverage won't be shown. Click here to find out more.
Continue to review full report at Codecov.
|
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.
Which rule and warnings did you add?
This pull request closes
Actions checklist
Fixme