Bugfix. NPE in fixing of LineLength Rule #858
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: * Added test
### What's done: * Fixed bug
### What's done: * Fixed bug
### What's done: * Fixed bug
Codecov Report
@@ Coverage Diff @@
## master #858 +/- ##
============================================
+ Coverage 80.42% 80.52% +0.09%
- Complexity 2199 2208 +9
============================================
Files 101 101
Lines 5671 5669 -2
Branches 1747 1751 +4
============================================
+ Hits 4561 4565 +4
+ Misses 265 257 -8
- Partials 845 847 +2
Flags with carried forward coverage won't be shown. Click here to find out more.
Continue to review full report at Codecov.
|
aktsay6
requested review from
petertrr and
kentr0w
and removed request for
petertrr
petertrr
requested changes
Apr 28, 2021
| * 1. When fun foo() = ... | ||
| * 2. There is an annotation before the function which breaks the maxLength parameter. | ||
| */ | ||
| private fun fixFunction(wrongFunction: ASTNode, configuration: LineLengthConfiguration) { |
There was a problem hiding this comment.
Why did you support only annotated functions?
| when (fixableType) { | ||
| is LongLineFixableCases.Fun -> fixableType.node.appendNewlineMergingWhiteSpace(null, fixableType.node.findChildByType(EQ)!!.treeNext) | ||
| is LongLineFixableCases.Fun -> fixFunction(fixableType.node, configuration) |
There was a problem hiding this comment.
Can we reuse existing logic for fixing long strings here?
### What's done: * Reworked logic of inserting new line in string template
### What's done: * Fixed bugs
### What's done: * Fixed bugs
petertrr
reviewed
Apr 29, 2021
diktat-rules/src/test/resources/test/paragraph3/long_line/LongLineRValueExpected.kt
Show resolved
Hide resolved
diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter3/LineLength.kt
Outdated
Show resolved
Hide resolved
| private fun checkFun(wrongNode: ASTNode) = | ||
| if (!wrongNode.hasChildOfType(BLOCK)) LongLineFixableCases.Fun(wrongNode) else LongLineFixableCases.None | ||
| if (!wrongNode.hasChildOfType(BLOCK) && !wrongNode.hasChildOfType(MODIFIER_LIST)) LongLineFixableCases.Fun(wrongNode) else LongLineFixableCases.None |
There was a problem hiding this comment.
Is it still for expression body functions only? Why not check for presence of EQ child node then? What would happen for expression body function with long parameters in annotation?
### What's done: * Fixed bugs
petertrr
approved these changes
Apr 30, 2021
### What's done: * Fixed bugs
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.
What's done:
This pull request closes #842