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

Allow empty first line in function that returns anonymous object #655

Merged
merged 1 commit into from
Nov 25, 2019
Merged

Allow empty first line in function that returns anonymous object #655

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
4 changes: 3 additions & 1 deletion ...ain/kotlin/com/pinterest/ktlint/ruleset/experimental/NoEmptyFirstLineInMethodBlockRule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package com.pinterest.ktlint.ruleset.experimental

import com.pinterest.ktlint.core.Rule
import com.pinterest.ktlint.core.ast.ElementType
import com.pinterest.ktlint.core.ast.ElementType.CLASS_BODY
import com.pinterest.ktlint.core.ast.ElementType.FUN
import com.pinterest.ktlint.core.ast.isPartOf
import com.pinterest.ktlint.core.ast.prevLeaf
Expand All @@ -17,7 +18,8 @@ class NoEmptyFirstLineInMethodBlockRule : Rule("no-empty-first-line-in-method-bl
emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit
) {
if (node is PsiWhiteSpace && node.textContains('\n') &&
node.prevLeaf()?.elementType == ElementType.LBRACE && node.isPartOf(FUN)
node.prevLeaf()?.elementType == ElementType.LBRACE && node.isPartOf(FUN) &&
node.treeParent.elementType != CLASS_BODY // fun fn() = object : Builder {\n\n fun stuff() = Unit }
) {
val split = node.getText().split("\n")
if (split.size > 2) {
Expand Down
28 changes: 28 additions & 0 deletions ...kotlin/com/pinterest/ktlint/ruleset/experimental/NoEmptyFirstLineInMethodBlockRuleTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,4 +140,32 @@ class NoEmptyFirstLineInMethodBlockRuleTest {
)
assertThat(NoEmptyFirstLineInMethodBlockRule().format(unformattedFunction)).isEqualTo(formattedFunction)
}

@Test
fun `lint empty first line may be placed in function inside anonymous object`() {
val code =
"""
fun fooBuilder() = object : Foo {

override fun foo() {
TODO()
}
}
""".trimIndent()
assertThat(NoEmptyFirstLineInMethodBlockRule().lint(code)).isEmpty()
}

@Test
fun `format empty first line may be placed in function inside anonymous object`() {
val code =
"""
fun fooBuilder() = object : Foo {

override fun foo() {
TODO()
}
}
""".trimIndent()
assertThat(NoEmptyFirstLineInMethodBlockRule().format(code)).isEqualTo(code)
}
}