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

Jump to bottom

Fixed WRONG_NEWLINES rule to take into account maxCallsInOneLine #1858

Merged
merged 2 commits into from
Dec 12, 2023
Merged

Fixed WRONG_NEWLINES rule to take into account maxCallsInOneLine #1858

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc9e65d
Fixed `WRONG_NEWLINES` rule to take into account `maxCallsInOneLine`
DrAlexD Dec 12, 2023
82ffcbb
Merge branch 'master' into bugfix/wrong_newlines
DrAlexD Dec 12, 2023
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
2 changes: 1 addition & 1 deletion ...rules/src/main/kotlin/com/saveourtool/diktat/ruleset/rules/chapter3/files/NewlinesRule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ class NewlinesRule(configRules: List<RulesConfig>) : DiktatRule(
) {
isDotQuaOrSafeAccessOrPostfixExpression(it) && it.elementType != POSTFIX_EXPRESSION
}.reversed()
if (listDot.size > 3) {
if (listDot.size > configuration.maxCallsInOneLine) {
val without = listDot.filterIndexed { index, it ->
val nodeBeforeDotOrSafeAccess = it.findChildByType(DOT)?.treePrev ?: it.findChildByType(SAFE_ACCESS)?.treePrev
val firstElem = it.firstChildNode
Expand Down
33 changes: 30 additions & 3 deletions ...les/src/test/kotlin/com/saveourtool/diktat/ruleset/chapter3/files/NewlinesRuleWarnTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ class NewlinesRuleWarnTest : LintTestBase(::NewlinesRule) {
RulesConfig(WRONG_NEWLINES.name, true,
mapOf("maxCallsInOneLine" to "1"))
)
private val rulesConfigListLong: List<RulesConfig> = listOf(
RulesConfig(WRONG_NEWLINES.name, true,
mapOf("maxCallsInOneLine" to "10"))
)
private val ruleId = "$DIKTAT_RULE_SET_ID:${NewlinesRule.NAME_ID}"
private val dotQuaOrSafeAccessOrPostfixExpression = "${WRONG_NEWLINES.warnText()} wrong split long `dot qualified expression` or `safe access expression`"
private val shouldBreakAfter = "${WRONG_NEWLINES.warnText()} should break a line after and not before"
Expand Down Expand Up @@ -682,7 +686,8 @@ class NewlinesRuleWarnTest : LintTestBase(::NewlinesRule) {
| }
|}
""".trimMargin(),
DiktatError(19, 20, ruleId, "${WRONG_NEWLINES.warnText()} should follow functional style at .", true),
DiktatError(16, 9, ruleId, dotQuaOrSafeAccessOrPostfixExpression, true),
DiktatError(19, 20, ruleId, "$functionalStyleWarn .", true),
rulesConfigList = rulesConfigListShort
)
}
Expand Down Expand Up @@ -829,9 +834,9 @@ class NewlinesRuleWarnTest : LintTestBase(::NewlinesRule) {
|}
""".trimMargin(),
DiktatError(2, 4, ruleId, dotQuaOrSafeAccessOrPostfixExpression, true),
DiktatError(3, 22, ruleId, "${WRONG_NEWLINES.warnText()} should follow functional style at .", true),
DiktatError(3, 22, ruleId, "$functionalStyleWarn .", true),
DiktatError(13, 4, ruleId, dotQuaOrSafeAccessOrPostfixExpression, true),
DiktatError(13, 23, ruleId, "${WRONG_NEWLINES.warnText()} should follow functional style at .", true)
DiktatError(13, 23, ruleId, "$functionalStyleWarn .", true)
)
}

Expand Down Expand Up @@ -893,7 +898,9 @@ class NewlinesRuleWarnTest : LintTestBase(::NewlinesRule) {
| .few()
|}
""".trimMargin(),
DiktatError(2, 4, ruleId, dotQuaOrSafeAccessOrPostfixExpression, true),
DiktatError(4, 10, ruleId, "$functionalStyleWarn .", true),
DiktatError(8, 4, ruleId, dotQuaOrSafeAccessOrPostfixExpression, true),
DiktatError(9, 11, ruleId, "$functionalStyleWarn .", true),
DiktatError(9, 17, ruleId, "$functionalStyleWarn .", true),
rulesConfigList = rulesConfigListShort
Expand Down Expand Up @@ -930,7 +937,9 @@ class NewlinesRuleWarnTest : LintTestBase(::NewlinesRule) {
|}
""".trimMargin(),
DiktatError(2, 7, ruleId, "$functionalStyleWarn .", true),
DiktatError(15, 4, ruleId, dotQuaOrSafeAccessOrPostfixExpression, true),
DiktatError(16, 10, ruleId, "$functionalStyleWarn .", true),
DiktatError(21, 4, ruleId, dotQuaOrSafeAccessOrPostfixExpression, true),
DiktatError(21, 7, ruleId, "$functionalStyleWarn .", true),
DiktatError(22, 10, ruleId, "$functionalStyleWarn .", true),
rulesConfigList = rulesConfigListShort
Expand Down Expand Up @@ -1051,6 +1060,7 @@ class NewlinesRuleWarnTest : LintTestBase(::NewlinesRule) {
""".trimMargin(),
DiktatError(2, 14, ruleId, "$functionalStyleWarn ?:", true),
DiktatError(4, 8, ruleId, "$functionalStyleWarn ?:", true),
DiktatError(4, 11, ruleId, dotQuaOrSafeAccessOrPostfixExpression, true),
DiktatError(4, 22, ruleId, "$functionalStyleWarn .", true),
rulesConfigList = rulesConfigListShort
)
Expand All @@ -1066,7 +1076,9 @@ class NewlinesRuleWarnTest : LintTestBase(::NewlinesRule) {
| a().b.c()!!
|}
""".trimMargin(),
DiktatError(2, 4, ruleId, dotQuaOrSafeAccessOrPostfixExpression, true),
DiktatError(2, 11, ruleId, "$functionalStyleWarn .", true),
DiktatError(3, 4, ruleId, dotQuaOrSafeAccessOrPostfixExpression, true),
DiktatError(3, 9, ruleId, "$functionalStyleWarn .", true),
rulesConfigList = rulesConfigListShort
)
Expand All @@ -1092,6 +1104,7 @@ class NewlinesRuleWarnTest : LintTestBase(::NewlinesRule) {
| .qwe()
|}
""".trimMargin(),
DiktatError(7, 11, ruleId, dotQuaOrSafeAccessOrPostfixExpression, true),
DiktatError(7, 22, ruleId, "$functionalStyleWarn .", true),
DiktatError(9, 15, ruleId, "$functionalStyleWarn ?:", true),
DiktatError(10, 16, ruleId, "$functionalStyleWarn ?:", true),
Expand Down Expand Up @@ -1152,6 +1165,7 @@ class NewlinesRuleWarnTest : LintTestBase(::NewlinesRule) {
| if(a().b().c()) {}
|}
""".trimMargin(),
DiktatError(2, 7, ruleId, dotQuaOrSafeAccessOrPostfixExpression, true),
DiktatError(2, 14, ruleId, "${COMPLEX_EXPRESSION.warnText()} .", false),
DiktatError(2, 14, ruleId, "$functionalStyleWarn .", true),
rulesConfigList = rulesConfigListShort
Expand Down Expand Up @@ -1195,4 +1209,17 @@ class NewlinesRuleWarnTest : LintTestBase(::NewlinesRule) {
fileName = "build.gradle.kts"
)
}

@Test
@Tags(Tag(WarningNames.WRONG_NEWLINES), Tag(WarningNames.COMPLEX_EXPRESSION))
fun `shouldn't trigger on allowed many calls in one line`() {
lintMethod(
"""
|fun foo() {
| if(a().b().c().d().e()) {}
|}
""".trimMargin(),
rulesConfigList = rulesConfigListLong
)
}
}
Loading