From 8fd166ea7b5b2047b9678f1e07d347632a4cdfec Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Fri, 6 Jun 2014 20:00:46 +0400 Subject: [PATCH] Minor. Method renamed --- .../org/jetbrains/jet/asJava/duplicateJvmSignatureUtil.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/duplicateJvmSignatureUtil.kt b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/duplicateJvmSignatureUtil.kt index 55600ff8282..6b02f3456c5 100644 --- a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/duplicateJvmSignatureUtil.kt +++ b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/duplicateJvmSignatureUtil.kt @@ -42,13 +42,13 @@ public fun getJvmSignatureDiagnostics(element: PsiElement, otherDiagnostics: Dia // property declared in constructor val parentClass = parent?.getParent() as? JetClass if (parentClass != null) { - return getDiagnosticsForNonLocalClass(parentClass) + return getDiagnosticsForClass(parentClass) } } if (parent is JetFile) { if (element is JetClassOrObject) { - return getDiagnosticsForNonLocalClass(element) + return getDiagnosticsForClass(element) } return getDiagnosticsForPackage(parent as JetFile) } @@ -57,7 +57,7 @@ public fun getJvmSignatureDiagnostics(element: PsiElement, otherDiagnostics: Dia val parentsParent = parent?.getParent() if (parentsParent is JetClassOrObject) { - return getDiagnosticsForNonLocalClass(parentsParent) + return getDiagnosticsForClass(parentsParent) } } return null @@ -126,6 +126,6 @@ private fun getDiagnosticsForPackage(file: JetFile): Diagnostics? { 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 }