Merge pull request #326 from rom4ek/colon-spacing-constructor-fix

Fix constructor's colon-spacing lint and format
pinterest · Feb 4, 2019 · 195fcb7 · 195fcb7
2 parents bff39f6 + 4d1f6dc
commit 195fcb7
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 3 deletions.
diff --git a/...ndard/src/main/kotlin/com/github/shyiko/ktlint/ruleset/standard/SpacingAroundColonRule.kt b/...ndard/src/main/kotlin/com/github/shyiko/ktlint/ruleset/standard/SpacingAroundColonRule.kt
@@ -35,7 +35,8 @@ class SpacingAroundColonRule : Rule("colon-spacing") {
                 }
             }
             val missingSpacingBefore = node.prevSibling !is PsiWhiteSpace &&
-                (node.parent is KtClassOrObject || node.parent.parent is KtTypeParameterList)
+                (node.parent is KtClassOrObject || node.parent is KtConstructor<*> ||
+                    node.parent is KtTypeConstraint || node.parent.parent is KtTypeParameterList)
             val missingSpacingAfter = node.nextSibling !is PsiWhiteSpace
             when {
                 missingSpacingBefore && missingSpacingAfter -> {

diff --git a/...d/src/test/kotlin/com/github/shyiko/ktlint/ruleset/standard/SpacingAroundColonRuleTest.kt b/...d/src/test/kotlin/com/github/shyiko/ktlint/ruleset/standard/SpacingAroundColonRuleTest.kt
@@ -57,10 +57,17 @@ class SpacingAroundColonRuleTest {
             class A {
                 @Deprecated("") @Throws(IOException::class, SecurityException::class)
                 protected abstract fun <T> f(
-                    @Nullable thing: String, things: List<T>): Runnable where T : Runnable, T : Closeable
+                    @Nullable thing: String, things: List<T>): Runnable where T : Runnable, T: Closeable
+            }
+            class A : B {
+                constructor(): super()
+                constructor(param: String) : super(param)
             }
             """.trimIndent()
-        )).isEmpty()
+        )).isEqualTo(listOf(
+            LintError(9, 82, "colon-spacing", "Missing spacing before \":\""),
+            LintError(12, 18, "colon-spacing", "Missing spacing before \":\"")
+        ))
     }
 
     @Test
@@ -74,6 +81,15 @@ class SpacingAroundColonRuleTest {
             }
             interface D
             interface C: D
+            class F(param: String):D(param)
+            class F2 constructor(param: String): D3(param)
+            class F3 : D3 {
+                constructor():super()
+                constructor(param: String): super(param)
+
+                val x = object:D3 { }
+            }
+            fun <T> max(a: T, b: T) where T: Comparable<T>
             """.trimIndent()
         )).isEqualTo(
             """
@@ -84,6 +100,15 @@ class SpacingAroundColonRuleTest {
             }
             interface D
             interface C : D
+            class F(param: String) : D(param)
+            class F2 constructor(param: String) : D3(param)
+            class F3 : D3 {
+                constructor() : super()
+                constructor(param: String) : super(param)
+
+                val x = object : D3 { }
+            }
+            fun <T> max(a: T, b: T) where T : Comparable<T>
             """.trimIndent()
         )
     }