Collapse if statements with comments #825
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: * Change collapseThenBlocks function: KtBlockExpression.statements didn't hold comments, now it's fixed * Monitor, which types of nodes are followed after nested if (more proper way), instead of check, that this if is the last child * Fix indentions in tests
kgevorkyan
changed the title
Codecov Report
@@ Coverage Diff @@
## master #825 +/- ##
============================================
+ Coverage 80.91% 80.98% +0.07%
- Complexity 2272 2289 +17
============================================
Files 100 100
Lines 5801 5833 +32
Branches 1798 1813 +15
============================================
+ Hits 4694 4724 +30
Misses 286 286
- Partials 821 823 +2
Flags with carried forward coverage won't be shown. Click here to find out more.
Continue to review full report at Codecov.
|
### What's done: * Add logic for if statements with commets and cover it with tests
kgevorkyan
force-pushed
the
feature/collapse_if_statements_with_comments
branch
from
758c34f
to
84dfaf2
Compare
### What's done: * Fix codestyle warning && and more tests
kgevorkyan
force-pushed
the
feature/collapse_if_statements_with_comments
branch
from
08b65f8
to
8843848
Compare
petertrr
requested changes
Apr 8, 2021
diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter3/CollapseIfStatementsRule.kt
Show resolved
Hide resolved
diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter3/CollapseIfStatementsRule.kt
Show resolved
Hide resolved
diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter3/CollapseIfStatementsRule.kt
Outdated
Show resolved
Hide resolved
diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter3/CollapseIfStatementsRule.kt
Show resolved
Hide resolved
### What's done: * Add recommendations from review and add more tests
### What's done: Add comments about of absence of a KDOC in allowed types
petertrr
approved these changes
Apr 8, 2021
### What's done: * Improve logic, when if-statements already have comments in conditions * Add tests
…entions rules ### What's done: * CollapseIfStatements rule should be invoked before LineLength and Indentions rules
### What's done: * Fix codestyle issues
|
@petertrr I improved the way of comments processing, check please last commits |
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: