Fix logic "BinaryExpression" in "LineLength" Rule #1292

Arrgentum · 2022-05-04T12:19:44Z

Fix logic of the line split in BinaryExpression in rule LineLength

This pull request closes #1244

Actions checklist

Correct rule LineLength
Added and correct tests on fixers

…d files in fix tested

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

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

diktat-rules/src/test/resources/test/paragraph3/long_line/LongLineCommentExpected2.kt

pom.xml

…d files in fix tested

codecov · 2022-05-04T13:02:18Z

Codecov Report

Merging #1292 (004e368) into master (6e60358) will decrease coverage by 0.09%.
The diff coverage is 87.38%.

@@             Coverage Diff              @@
##             master    #1292      +/-   ##
============================================
- Coverage     82.07%   81.97%   -0.10%     
- Complexity     2525     2527       +2     
============================================
  Files           105      105              
  Lines          7195     7169      -26     
  Branches       2057     2053       -4     
============================================
- Hits           5905     5877      -28     
- Misses          344      346       +2     
  Partials        946      946

Flag	Coverage Δ
unittests	`81.97% <87.38%> (-0.10%)`	⬇️

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

Impacted Files	Coverage Δ
...qfn/diktat/ruleset/rules/chapter1/PackageNaming.kt	`89.83% <ø> (ø)`
...g/cqfn/diktat/ruleset/rules/chapter3/LineLength.kt	`89.32% <87.38%> (-1.72%)`	⬇️

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 6e60358...004e368. Read the comment docs.

…_binary # Conflicts: # diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter1/PackageNaming.kt

…d files in fix tested

orchestr7 · 2022-05-04T15:05:50Z

Alexey, please start naming PR properly :(

"Condition" - bad name ❌
"Condition for balboa to blabla" - good name

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

…d files in fix tested, delete comment code

sanyavertolet

Please keep an eye on how your branch is called! It should start with feature/, bugfix/, hotfix/ of infra/ (if I am not mistaken).

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

petertrr · 2022-05-11T09:39:38Z

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

    @Suppress("KDOC_NO_CONSTRUCTOR_PROPERTY", "MISSING_KDOC_CLASS_ELEMENTS")  // todo add proper docs
-    sealed class LongLineFixableCases {
-        object None : LongLineFixableCases()
+    open class LongLineFixableCases(val node: ASTNode)


Why did you change sealed for open?

Yes, you're right, I changed it back

petertrr · 2022-05-11T09:40:24Z

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

+    /**
+     * Class None show error long line have unidentified type or something else that we can't analyze
+     */
+    class None : LongLineFixableCases(KotlinParser().createNode("ERROR"))


It still can be an object

If I do that, there will be something breaking in the logic

…d files in fix tested, delete comment code

…_binary

diktat-rules/src/test/resources/test/paragraph3/long_line/LongBinaryExpressionExpected.kt

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

2) Added test

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

2) Added test

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

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

kgevorkyan · 2022-05-12T15:00:41Z

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

-        val indexLastSpace = wrongProperty.indexLastSpace
-        val text = wrongProperty.text
-        splitTextAndCreateNode(node, text, indexLastSpace)
+    @Suppress("TYPE_ALIAS", "UnsafeCallOnNullableType")


Strange, that diktat doesn't trigger on this line, because there is no whitespaces, between suppress and previous method, probably this is because annotation type

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

2) Added tests

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

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

sanyavertolet

When more tasks with this rule are done, you will need to add tests that cover all the LongLine rule

Arrgentum added 7 commits April 15, 2022 12:12

first version

6e437e4

Merge branch 'master' into condition

7f32265

fix Binary Expression

1a3fafc

# fix rule line length (split in binary expression), change 5 expecte…

e199296

…d files in fix tested

# fix rule line length (split in binary expression), change 5 expecte…

6874cfc

…d files in fix tested

# fix rule line length (split in binary expression), change 5 expecte…

298135e

…d files in fix tested

# fix rule line length (split in binary expression), change 5 expecte…

b32706a

…d files in fix tested

sanyavertolet reviewed May 4, 2022

View reviewed changes

Arrgentum and others added 2 commits May 4, 2022 15:53

Merge branch 'master' into condition

83cb0ec

# fix rule line length (split in binary expression), change 5 expecte…

a3f9dbc

…d files in fix tested

Arrgentum added 3 commits May 4, 2022 16:23

Merge remote-tracking branch 'origin/condition' into bugfix/Long_line…

8af6958

…_binary # Conflicts: # diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter1/PackageNaming.kt

# fix rule line length (split in binary expression), change 5 expecte…

e612b48

…d files in fix tested

# fix rule line length (split in binary expression), change 5 expecte…

a913203

…d files in fix tested

Arrgentum changed the title ~~Condition~~ Fix Rule "LineLength" in "BinaryExpression" May 4, 2022

Arrgentum changed the title ~~Fix Rule "LineLength" in "BinaryExpression"~~ Fix logic "BinaryExpression" in "LineLength" Rule May 4, 2022

sanyavertolet reviewed May 4, 2022

View reviewed changes

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

Arrgentum and others added 5 commits May 4, 2022 18:38

# fix rule line length (split in binary expression), change 5 expecte…

4789e76

…d files in fix tested, delete comment code

# fix rule line length (split in binary expression), change 5 expecte…

cde3606

…d files in fix tested, delete comment code

# fix rule line length (split in binary expression), change 5 expecte…

290d8fd

…d files in fix tested, delete comment code

# fix rule line length (split in binary expression), change 5 expecte…

783b3d9

…d files in fix tested, delete comment code

Merge branch 'master' into condition

dcf2e4f

sanyavertolet requested changes May 6, 2022

View reviewed changes

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

petertrr reviewed May 11, 2022

View reviewed changes

Arrgentum added 3 commits May 11, 2022 17:22

# fix rule line length (split in binary expression), change 5 expecte…

2df4e32

…d files in fix tested, delete comment code

# fix rule line length (split in binary expression), change 5 expecte…

0ad8e36

…d files in fix tested, delete comment code

Merge remote-tracking branch 'origin/condition' into bugfix/Long_line…

d316e0c

…_binary

kgevorkyan reviewed May 11, 2022

View reviewed changes

diktat-rules/src/test/resources/test/paragraph3/long_line/LongBinaryExpressionExpected.kt Show resolved Hide resolved

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

1) Fixed logic and tests for binary expression in rule "LineLength"

cb03cc0

2) Added test

Arrgentum added 5 commits May 12, 2022 13:48

1) Fixed logic and tests for binary expression in rule "LineLength"

e59912d

2) Added test

1) Fixed logic and tests for binary expression in rule "LineLength"

e55eedc

2) Added test

1) Fixed logic and tests for binary expression in rule "LineLength"

69f67c0

2) Added test

1) Fixed logic and tests for binary expression in rule "LineLength"

19689c5

2) Added test

1) Fixed logic and tests for binary expression in rule "LineLength"

2f7b875

2) Added test

sanyavertolet reviewed May 12, 2022

View reviewed changes

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

Arrgentum added 2 commits May 12, 2022 16:17

1) Fixed logic and tests for binary expression in rule "LineLength"

e95ed49

2) Added test

1) Fixed logic and tests for binary expression in rule "LineLength"

0f3c0c9

2) Added test

kgevorkyan reviewed May 12, 2022

View reviewed changes

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

kgevorkyan reviewed May 12, 2022

View reviewed changes

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

kgevorkyan reviewed May 12, 2022

View reviewed changes

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

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

kgevorkyan reviewed May 12, 2022

View reviewed changes

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

kgevorkyan reviewed May 12, 2022

View reviewed changes

Arrgentum added 2 commits May 12, 2022 19:27

1) Fixed logic and tests for binary expression in rule "LineLength"

5ee9635

2) Added tests

1) Fixed logic and tests for binary expression in rule "LineLength"

3148834

2) Added tests

kgevorkyan reviewed May 13, 2022

View reviewed changes

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

kgevorkyan reviewed May 13, 2022

View reviewed changes

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

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

Corrected the code for all comments in the pull request

6944b42

Arrgentum requested a review from sanyavertolet May 16, 2022 09:36

Corrected the code for all comments in the pull request

004e368

kgevorkyan approved these changes May 16, 2022

View reviewed changes

sanyavertolet approved these changes May 16, 2022

View reviewed changes

Arrgentum requested a review from petertrr May 16, 2022 11:29

orchestr7 approved these changes May 16, 2022

View reviewed changes

Arrgentum merged commit 4a13e39 into master May 16, 2022

Arrgentum deleted the condition branch May 16, 2022 13:32

This was referenced Jun 21, 2022

Correct Readme #1381

Closed

Bugfix/corrected readme #1384

Merged

Arrgentum self-assigned this Jun 21, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix logic "BinaryExpression" in "LineLength" Rule #1292

Fix logic "BinaryExpression" in "LineLength" Rule #1292

Arrgentum commented May 4, 2022 •

edited by sanyavertolet

Loading

codecov bot commented May 4, 2022 •

edited

Loading

orchestr7 commented May 4, 2022 •

edited

Loading

sanyavertolet left a comment

petertrr May 11, 2022

Arrgentum May 12, 2022

petertrr May 11, 2022

Arrgentum May 12, 2022

kgevorkyan May 12, 2022

Arrgentum May 16, 2022

sanyavertolet left a comment •

edited

Loading

Fix logic "BinaryExpression" in "LineLength" Rule #1292

Fix logic "BinaryExpression" in "LineLength" Rule #1292

Conversation

Arrgentum commented May 4, 2022 • edited by sanyavertolet Loading

Fix logic of the line split in BinaryExpression in rule LineLength

Actions checklist

codecov bot commented May 4, 2022 • edited Loading

Codecov Report

orchestr7 commented May 4, 2022 • edited Loading

sanyavertolet left a comment

Choose a reason for hiding this comment

petertrr May 11, 2022

Choose a reason for hiding this comment

Arrgentum May 12, 2022

Choose a reason for hiding this comment

petertrr May 11, 2022

Choose a reason for hiding this comment

Arrgentum May 12, 2022

Choose a reason for hiding this comment

kgevorkyan May 12, 2022

Choose a reason for hiding this comment

Arrgentum May 16, 2022

Choose a reason for hiding this comment

sanyavertolet left a comment • edited Loading

Choose a reason for hiding this comment

Arrgentum commented May 4, 2022 •

edited by sanyavertolet

Loading

codecov bot commented May 4, 2022 •

edited

Loading

orchestr7 commented May 4, 2022 •

edited

Loading

sanyavertolet left a comment •

edited

Loading