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

Minor. Method renamed

Browse Source
This commit is contained in:
Andrey Breslav
2014-06-06 20:00:46 +04:00
parent 05685bea5b
commit 8fd166ea7b
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/duplicateJvmSignatureUtil.kt
+4 -4
View File
@@ -42,13 +42,13 @@ public fun getJvmSignatureDiagnostics(element: PsiElement, otherDiagnostics: Dia
// property declared in constructor // property declared in constructor
val parentClass = parent?.getParent() as? JetClass val parentClass = parent?.getParent() as? JetClass
if (parentClass != null) { if (parentClass != null) {
return getDiagnosticsForNonLocalClass(parentClass) return getDiagnosticsForClass(parentClass)
} }
} }
if (parent is JetFile) { if (parent is JetFile) {
if (element is JetClassOrObject) { if (element is JetClassOrObject) {
return getDiagnosticsForNonLocalClass(element) return getDiagnosticsForClass(element)
} }
return getDiagnosticsForPackage(parent as JetFile) return getDiagnosticsForPackage(parent as JetFile)
} }
@@ -57,7 +57,7 @@ public fun getJvmSignatureDiagnostics(element: PsiElement, otherDiagnostics: Dia
val parentsParent = parent?.getParent() val parentsParent = parent?.getParent()
if (parentsParent is JetClassOrObject) { if (parentsParent is JetClassOrObject) {
return getDiagnosticsForNonLocalClass(parentsParent) return getDiagnosticsForClass(parentsParent)
} }
} }
return null return null
@@ -126,6 +126,6 @@ private fun getDiagnosticsForPackage(file: JetFile): Diagnostics? {
return cache[file.getPackageFqName(), GlobalSearchScope.allScope(project)].getValue()?.extraDiagnostics return cache[file.getPackageFqName(), GlobalSearchScope.allScope(project)].getValue()?.extraDiagnostics
} }
private fun getDiagnosticsForNonLocalClass(jetClassOrObject: JetClassOrObject): Diagnostics { private fun getDiagnosticsForClass(jetClassOrObject: JetClassOrObject): Diagnostics {
return KotlinLightClassForExplicitDeclaration.getLightClassData(jetClassOrObject).extraDiagnostics return KotlinLightClassForExplicitDeclaration.getLightClassData(jetClassOrObject).extraDiagnostics
} }