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

Remove spacing between "}" and "]" #596

Merged
merged 1 commit into from
Oct 3, 2019
Merged

Remove spacing between "}" and "]" #596

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
2 changes: 2 additions & 0 deletions ...-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/SpacingAroundCurlyRule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import com.pinterest.ktlint.core.ast.ElementType.LBRACE
import com.pinterest.ktlint.core.ast.ElementType.LBRACKET
import com.pinterest.ktlint.core.ast.ElementType.LPAR
import com.pinterest.ktlint.core.ast.ElementType.RBRACE
import com.pinterest.ktlint.core.ast.ElementType.RBRACKET
import com.pinterest.ktlint.core.ast.ElementType.RPAR
import com.pinterest.ktlint.core.ast.ElementType.SAFE_ACCESS
import com.pinterest.ktlint.core.ast.ElementType.SEMICOLON
Expand Down Expand Up @@ -116,6 +117,7 @@ class SpacingAroundCurlyRule : Rule("curly-spacing") {
return (
nextElementType == DOT ||
nextElementType == COMMA ||
nextElementType == RBRACKET ||
nextElementType == RPAR ||
nextElementType == SEMICOLON ||
nextElementType == SAFE_ACCESS ||
Expand Down
10 changes: 10 additions & 0 deletions ...ndard/src/test/kotlin/com/pinterest/ktlint/ruleset/standard/SpacingAroundCurlyRuleTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,14 @@ class SpacingAroundCurlyRuleTest {
LintError(2, 37, "curly-spacing", "Unexpected space after \"}\"")
)
)
assertThat(SpacingAroundCurlyRule().lint("fun main() { map[1 + list.count { it != true }] = 1 }"))
.isEmpty()
assertThat(SpacingAroundCurlyRule().lint("fun main() { map[1 + list.count { it != true } ] = 1 }"))
.isEqualTo(
listOf(
LintError(1, 46, "curly-spacing", "Unexpected space after \"}\"")
)
)
}

@Test
Expand Down Expand Up @@ -109,6 +117,7 @@ class SpacingAroundCurlyRuleTest {
)
val f =
{ true }
map[1 + list.count { it != true } ] = 1
}
class A { private val shouldEjectBlock = block@ { (pathProgress ?: return@block false) >= 0.85 } }
""".trimIndent()
Expand Down Expand Up @@ -152,6 +161,7 @@ class SpacingAroundCurlyRuleTest {
)
val f =
{ true }
map[1 + list.count { it != true }] = 1
}
class A { private val shouldEjectBlock = block@{ (pathProgress ?: return@block false) >= 0.85 } }
""".trimIndent()
Expand Down