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

Fix false positive Missing newline after "->" when when entry has if/else block #916

Merged
merged 1 commit into from
Sep 18, 2020
+18 −2
Merged

Fix false positive Missing newline after "->" when when entry has if/else block #916

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions ...ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/IndentationRule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,8 +347,7 @@ class IndentationRule : Rule("indent"), Rule.Modifier.RestrictToRootLast {
if (lToken != null && lToken.elementType in lTokenSet) {
val rElementType = matchingRToken[lToken.elementType]
val rToken = lToken.nextSibling { it.elementType == rElementType }
val lf = rToken?.nextLeaf { it.isWhiteSpaceWithNewline() }
return lf?.parent({ it == p }) == null
return rToken?.treeParent == lToken.treeParent
}
if (nextCodeSibling?.textContains('\n') == false) {
return true
Expand Down
17 changes: 17 additions & 0 deletions ktlint-ruleset-standard/src/test/resources/spec/indent/lint-when-expression.kt.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,23 @@ fun main() {
else -> 2 + 3
}
}
val v3 = when (1) {
1 -> if (true) {
2
} else {
3
}
else -> 0
}

val v4 = when (1) {
1 -> 1.let {
it + 1
}.let {
it + 1
}
else -> 0
}
}

// expect
Expand Down