azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Inspection & fix for redundant supertype qualification

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-08-26 15:05:10 +03:00
parent d62eeb1c25
commit 4717b17418
30 changed files with 531 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/psi/JetExpressionWithLabel.kt
+4 -2
View File
@@ -23,8 +23,10 @@ import org.jetbrains.kotlin.name.Name
open public class JetExpressionWithLabel(node: ASTNode) : JetExpressionImpl(node) {
public fun getTargetLabel(): JetSimpleNameExpression? =
findChildByType<JetContainerNode>(JetNodeTypes.LABEL_QUALIFIER)?.
findChildByType(JetNodeTypes.LABEL) as? JetSimpleNameExpression
labelQualifier?.findChildByType(JetNodeTypes.LABEL) as? JetSimpleNameExpression
public val labelQualifier: JetContainerNode?
get() = findChildByType(JetNodeTypes.LABEL_QUALIFIER)
public fun getLabelName(): String? = getTargetLabel()?.getReferencedName()
public fun getLabelNameAsName(): Name? = getTargetLabel()?.getReferencedNameAsName()
compiler/frontend/src/org/jetbrains/kotlin/psi/JetPsiUtil.java
+4
View File
@@ -494,6 +494,10 @@ public class JetPsiUtil {
return JetExpressionParsing.Precedence.ASSIGNMENT.ordinal();
}
if (expression instanceof JetSuperExpression) {
return maxPriority;
}
if (expression instanceof JetDeclaration || expression instanceof JetStatementExpression) {
return 0;
}