Fixed #34 - unnecessary spacing around angle brackets in case of supe…

…r<T>
pinterest · Feb 28, 2017 · e7038be · e7038be
1 parent af7fbb6
commit e7038be
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/...rd/src/main/kotlin/com/gihub/shyiko/ktlint/ruleset/standard/SpacingAroundOperatorsRule.kt b/...rd/src/main/kotlin/com/gihub/shyiko/ktlint/ruleset/standard/SpacingAroundOperatorsRule.kt
@@ -32,6 +32,7 @@ import org.jetbrains.kotlin.lexer.KtTokens.PLUS
 import org.jetbrains.kotlin.lexer.KtTokens.PLUSEQ
 import org.jetbrains.kotlin.psi.KtImportDirective
 import org.jetbrains.kotlin.psi.KtPrefixExpression
+import org.jetbrains.kotlin.psi.KtSuperExpression
 import org.jetbrains.kotlin.psi.KtTypeArgumentList
 import org.jetbrains.kotlin.psi.KtTypeParameterList
 import org.jetbrains.kotlin.psi.KtValueArgument
@@ -48,7 +49,8 @@ class SpacingAroundOperatorsRule : Rule("op-spacing") {
             !node.isPartOf(KtTypeParameterList::class) && // fun <T>fn(): T {}
             !node.isPartOf(KtTypeArgumentList::class) && // C<T>
             !node.isPartOf(KtValueArgument::class) && // fn(*array)
-            !node.isPartOf(KtImportDirective::class) // import *
+            !node.isPartOf(KtImportDirective::class) && // import *
+            !node.isPartOf(KtSuperExpression::class) // super<T>
         ) {
             val spacingBefore = PsiTreeUtil.prevLeaf(node, true) is PsiWhiteSpace
             val spacingAfter = PsiTreeUtil.nextLeaf(node, true) is PsiWhiteSpace

diff --git a/...c/test/kotlin/com/github/shyiko/ktlint/ruleset/standard/SpacingAroundOperatorsRuleTest.kt b/...c/test/kotlin/com/github/shyiko/ktlint/ruleset/standard/SpacingAroundOperatorsRuleTest.kt
@@ -30,6 +30,12 @@ class SpacingAroundOperatorsRuleTest {
                 val a= ""
                 d *= 1
                 call(*v)
+                open class A<T> {
+                    open fun x() {}
+                }
+                class B<T> : A<T>() {
+                    override fun x() = super<A>.x()
+                }
             }
             """.trimIndent()
         )).isEqualTo(listOf(