Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bugfixing of single binary expression wrapped in parentheses (long lines rule) #1416

Merged
merged 4 commits into from
Jun 30, 2022
Merged

Bugfixing of single binary expression wrapped in parentheses (long lines rule) #1416

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b721c9f
## Whats Added:
Jun 29, 2022
c879e98
Merge branch 'master' into bugfix/ErrorInLongLine
Arrgentum Jun 29, 2022
56a155e
Merge branch 'master' into bugfix/ErrorInLongLine
orchestr7 Jun 30, 2022
ccc0e0a
Update LineLength.kt
orchestr7 Jun 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter3/LineLength.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -541,7 +541,12 @@ class LineLength(configRules: List<RulesConfig>) : DiktatRule(
*/
private class BinaryExpression(node: ASTNode) : LongLineFixableCases(node) {
override fun fix() {
val nodeOperationReference = node.findChildByType(OPERATION_REFERENCE)
val binNode = if (node.elementType == PARENTHESIZED) {
node.findChildByType(BINARY_EXPRESSION)
} else {
node
}
val nodeOperationReference = binNode?.findChildByType(OPERATION_REFERENCE)
val nextNode = if (nodeOperationReference?.firstChildNode?.elementType != ELVIS) {
nodeOperationReference?.treeNext
} else {
Expand All @@ -551,7 +556,7 @@ class LineLength(configRules: List<RulesConfig>) : DiktatRule(
nodeOperationReference
}
}
node.appendNewlineMergingWhiteSpace(nextNode, nextNode)
binNode?.appendNewlineMergingWhiteSpace(nextNode, nextNode)
orchestr7 marked this conversation as resolved.
Show resolved Hide resolved
}
}

Expand Down
5 changes: 5 additions & 0 deletions diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/LineLengthFixTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,4 +107,9 @@ class LineLengthFixTest : FixTestBase("test/paragraph3/long_line", ::LineLength)
fun `fix bin expression first symbol last word`() {
fixAndCompare("LongBinaryExpressionLastWordExpected.kt", "LongBinaryExpressionLastWordTest.kt", rulesConfigListErrorLineLength1)
}

@Test
fun `fix bin 1expression first symbol last word`() {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

typo in test name

fixAndCompare("LongComplexExpressionExpected.kt", "LongComplexExpressionTest.kt", rulesConfigListErrorLineLength1)
}
}
9 changes: 9 additions & 0 deletions diktat-rules/src/test/resources/test/paragraph3/long_line/LongComplexExpressionExpected.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package test.paragraph3.long_line

fun foo(){
val attrs.disabled = (selfRole == Role.OWNER && isSelfRecord(props.selfUserInfo, user)) || !(selfRole.isHigherOrEqualThan(Role.OWNER) ||
userRole.isLowerThan(selfRole))
}

val attrs.disabled = (selfRole == Role.OWNER && isSelfRecord(props.selfUserInfo, user)) || !(selfRole.isHigherOrEqualThan(Role.OWNER) ||
userRole.isLowerThan(selfRole))
7 changes: 7 additions & 0 deletions diktat-rules/src/test/resources/test/paragraph3/long_line/LongComplexExpressionTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package test.paragraph3.long_line

fun foo(){
val attrs.disabled = (selfRole == Role.OWNER && isSelfRecord(props.selfUserInfo, user)) || !(selfRole.isHigherOrEqualThan(Role.OWNER) || userRole.isLowerThan(selfRole))
}

val attrs.disabled = (selfRole == Role.OWNER && isSelfRecord(props.selfUserInfo, user)) || !(selfRole.isHigherOrEqualThan(Role.OWNER) || userRole.isLowerThan(selfRole))