(WIP) Collapse if statements rule (#801) #814

kgevorkyan · 2021-03-29T12:41:42Z

What's done:

Add rule description to the avaliable-rules, DiktatRuleSetProvider.kt and to the Warnings.kt
Detect nested if statements (level 2)
Add test for nested if statements

### What's done: * Add rule description to the avaliable-rules, DiktatRuleSetProvider.kt and to the Warnings.kt * Detect nested if statements (level 2) * Add test for nested if statements

diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter3/CollapseIfStatementsRule.kt

diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/constants/Warnings.kt

orchestr7

and extend tests please

codecov · 2021-03-29T12:52:17Z

Codecov Report

Merging #814 (a9c2040) into master (9b75ec5) will decrease coverage by 0.03%.
The diff coverage is 79.76%.

@@             Coverage Diff              @@
##             master     #814      +/-   ##
============================================
- Coverage     80.95%   80.91%   -0.04%     
- Complexity     2248     2272      +24     
============================================
  Files            99      100       +1     
  Lines          5738     5801      +63     
  Branches       1783     1798      +15     
============================================
+ Hits           4645     4694      +49     
  Misses          286      286              
- Partials        807      821      +14

Flag	Coverage Δ	Complexity Δ
unittests	`80.91% <79.76%> (-0.04%)`	`0.00 <33.00> (ø)`

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files	Coverage Δ	Complexity Δ
.../diktat/ruleset/rules/chapter1/IdentifierNaming.kt	`81.52% <ø> (ø)`	`88.00 <0.00> (ø)`
.../ruleset/rules/chapter3/StringConcatenationRule.kt	`71.73% <ø> (ø)`	`53.00 <0.00> (ø)`
...fn/diktat/ruleset/rules/chapter4/NullChecksRule.kt	`75.00% <ø> (ø)`	`37.00 <0.00> (ø)`
...qfn/diktat/ruleset/rules/chapter4/TypeAliasRule.kt	`85.71% <ø> (ø)`	`11.00 <0.00> (ø)`
...diktat/ruleset/rules/chapter6/AvoidUtilityClass.kt	`77.27% <ø> (ø)`	`16.00 <0.00> (ø)`
.../ruleset/rules/chapter2/kdoc/CommentsFormatting.kt	`69.37% <62.50%> (-0.20%)`	`76.00 <4.00> (ø)`
...ruleset/rules/chapter3/CollapseIfStatementsRule.kt	`78.12% <78.12%> (ø)`	`24.00 <24.00> (?)`
...tlin/org/cqfn/diktat/ruleset/constants/Chapters.kt	`68.00% <100.00%> (+1.33%)`	`3.00 <1.00> (ø)`
...tlin/org/cqfn/diktat/ruleset/constants/Warnings.kt	`97.91% <100.00%> (+0.01%)`	`12.00 <0.00> (ø)`
...cqfn/diktat/ruleset/rules/DiktatRuleSetProvider.kt	`92.24% <100.00%> (+0.06%)`	`11.00 <0.00> (ø)`
... and 3 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 9b75ec5...a9c2040. Read the comment docs.

diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter3/CollapseIfStatementsRule.kt

### What's done: * Change the way of the detection of nested if statements * Provide logic for collapsing nested if statements, for now catched nested level is 2 * Add few tests

### What's done: * Add configuration arg * Upload WarningNames and diktat-analysis * (WIP) Work on bug in collapsing of THEN parts

### What's done: * Fix collapsing of THEN blocks

### What's done: * Split functionality to several functions * Fix the way of merging the nested conditions * First support of nested if statements with nested level more than 2

### What's done: * Polish logic method * Improve warn tests and add fix tests * Add rule to guide

…_if_statements

### What's done: * Add functionality of merging for compound conditions * Add corresponding tests

### What's done: * Add collapse if rule to other diktat-analysis files

### What's done: * Add new check: don't collapse statements, if nested if have else node * Separate collapse funtion to two ones * Add more tests

diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter3/CollapseIfStatementsRule.kt

info/guide/guide-chapter-3.md

### What's done: * Now nested if statements are collected in structure in aim to change ugly loops * Appy review comments

diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter3/CollapseIfStatementsRule.kt

...t-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/CollapseIfStatementsRuleWarnTest.kt

diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter3/CollapseIfStatementsRule.kt

### What's done: * Fix incorrect behaviour, when parent IF have multiple IF child * Add more tests for these cases * Refactoring

diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter3/CollapseIfStatementsRule.kt

…_if_statements

### What's done: * Improve logic of searching nested if, avoid npe * Add tests

### What's done: * Update existing files according new rule

### What's done: * Add new check in logic: we won't collapse statements, if parent have else node * Fix tests

diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter1/IdentifierNaming.kt

diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter3/CollapseIfStatementsRule.kt

diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter4/NullChecksRule.kt

petertrr

LGTM

### What's done: * Fix remarks according review

orchestr7

lgtm

Add initial version for collapse if statements rule (#801)

8066a5f

### What's done: * Add rule description to the avaliable-rules, DiktatRuleSetProvider.kt and to the Warnings.kt * Detect nested if statements (level 2) * Add test for nested if statements

kgevorkyan requested review from petertrr and orchestr7 March 29, 2021 12:41

kgevorkyan assigned orchestr7 Mar 29, 2021

orchestr7 reviewed Mar 29, 2021

View reviewed changes

diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter3/CollapseIfStatementsRule.kt Outdated Show resolved Hide resolved

orchestr7 reviewed Mar 29, 2021

View reviewed changes

diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter3/CollapseIfStatementsRule.kt Outdated Show resolved Hide resolved

orchestr7 reviewed Mar 29, 2021

View reviewed changes

diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/constants/Warnings.kt Show resolved Hide resolved

orchestr7 requested changes Mar 29, 2021

View reviewed changes

kgevorkyan commented Mar 30, 2021

View reviewed changes

diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter3/CollapseIfStatementsRule.kt Show resolved Hide resolved

kgevorkyan added 4 commits March 30, 2021 16:31

(WIP) Provide logic for collapsing nested if statements (nested level 2)

a6fffa2

### What's done: * Change the way of the detection of nested if statements * Provide logic for collapsing nested if statements, for now catched nested level is 2 * Add few tests

Preparation for handling more deep nesting level

39c626b

### What's done: * Add configuration arg * Upload WarningNames and diktat-analysis * (WIP) Work on bug in collapsing of THEN parts

Fix collapsing of THEN blocks

025dfca

### What's done: * Fix collapsing of THEN blocks

First support of nested level of if statements > 2

760b9d9

### What's done: * Split functionality to several functions * Fix the way of merging the nested conditions * First support of nested if statements with nested level more than 2

orchestr7 linked an issue Apr 1, 2021 that may be closed by this pull request

Rule for collapsing IF-statements #801

Closed

Polish logic and add tests

a1a3ac4

### What's done: * Polish logic method * Improve warn tests and add fix tests * Add rule to guide

kgevorkyan force-pushed the feature/collapse_if_statements branch from c3eef47 to a1a3ac4 Compare April 1, 2021 12:45

kgevorkyan added 4 commits April 1, 2021 15:51

Merge branch 'master' of github.com:cqfn/diKTat into feature/collapse…

cd636b0

…_if_statements

Add functionality of merging for compound conditions

1e44075

### What's done: * Add functionality of merging for compound conditions * Add corresponding tests

Add collapse if rule to other diktat-analysis files

a556a05

### What's done: * Add collapse if rule to other diktat-analysis files

Don't collapse statements, if nested if have else node

355c426

### What's done: * Add new check: don't collapse statements, if nested if have else node * Separate collapse funtion to two ones * Add more tests

kgevorkyan force-pushed the feature/collapse_if_statements branch from b8d80c8 to 355c426 Compare April 1, 2021 15:49

petertrr reviewed Apr 2, 2021

View reviewed changes

Refactoring logic function

758cc3e

### What's done: * Now nested if statements are collected in structure in aim to change ugly loops * Appy review comments

kgevorkyan force-pushed the feature/collapse_if_statements branch from 489a09d to 758cc3e Compare April 2, 2021 13:35

petertrr reviewed Apr 2, 2021

View reviewed changes

Fix incorrect behaviour, when parent IF have multiple IF child

e839c30

### What's done: * Fix incorrect behaviour, when parent IF have multiple IF child * Add more tests for these cases * Refactoring

kgevorkyan force-pushed the feature/collapse_if_statements branch from 395fa3e to e839c30 Compare April 2, 2021 15:26

petertrr reviewed Apr 2, 2021

View reviewed changes

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

Merge branch 'master' of github.com:cqfn/diKTat into feature/collapse…

857d85b

…_if_statements

Avoid NPE and improve logic

92ee845

### What's done: * Improve logic of searching nested if, avoid npe * Add tests

kgevorkyan force-pushed the feature/collapse_if_statements branch 4 times, most recently from ebd606c to 3a82929 Compare April 5, 2021 11:04

Update existing files according new rule

ee917c1

### What's done: * Update existing files according new rule

kgevorkyan force-pushed the feature/collapse_if_statements branch from 3a82929 to ee917c1 Compare April 5, 2021 11:15

Don't collapse statements, if parent if have else node

fa81c09

### What's done: * Add new check in logic: we won't collapse statements, if parent have else node * Fix tests

kgevorkyan force-pushed the feature/collapse_if_statements branch from 59aa551 to fa81c09 Compare April 5, 2021 12:36

petertrr reviewed Apr 5, 2021

View reviewed changes

petertrr mentioned this pull request Apr 5, 2021

Typealiases should be named in PascalCase #823

Closed

petertrr approved these changes Apr 5, 2021

View reviewed changes

Fix remarks according review

e9cf98a

### What's done: * Fix remarks according review

kgevorkyan marked this pull request as ready for review April 5, 2021 14:09

orchestr7 approved these changes Apr 5, 2021

View reviewed changes

Merge branch 'master' into feature/collapse_if_statements

a9c2040

kgevorkyan merged commit 199dd99 into master Apr 5, 2021

kgevorkyan deleted the feature/collapse_if_statements branch April 7, 2021 12:02

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

(WIP) Collapse if statements rule (#801) #814

(WIP) Collapse if statements rule (#801) #814

kgevorkyan commented Mar 29, 2021

orchestr7 left a comment

codecov bot commented Mar 29, 2021 •

edited

Loading

petertrr left a comment

orchestr7 left a comment

(WIP) Collapse if statements rule (#801) #814

(WIP) Collapse if statements rule (#801) #814

Conversation

kgevorkyan commented Mar 29, 2021

What's done:

orchestr7 left a comment

Choose a reason for hiding this comment

codecov bot commented Mar 29, 2021 • edited Loading

Codecov Report

petertrr left a comment

Choose a reason for hiding this comment

orchestr7 left a comment

Choose a reason for hiding this comment

codecov bot commented Mar 29, 2021 •

edited

Loading