From 7f051e38e58644da15706a968495c7414d4c5128 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Fri, 28 Dec 2012 20:19:08 +0400 Subject: [PATCH] toString() for KotlinLightClassForExplicitDeclaration --- .../asJava/KotlinLightClassForExplicitDeclaration.java | 10 ++++++++++ .../search/annotations/testAnnotationsOnClass.kt | 6 +++--- .../annotations/testAnnotationsWithParameters.kt | 2 +- .../search/inheritance/testInheritanceFromJavaClass.kt | 2 +- .../inheritance/testInheritanceFromKotlinClass.kt | 2 +- idea/testData/search/junit/testJunit3.kt | 2 +- 6 files changed, 17 insertions(+), 7 deletions(-) diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightClassForExplicitDeclaration.java b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightClassForExplicitDeclaration.java index f2f4ae9ddb9..9a2b433e660 100644 --- a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightClassForExplicitDeclaration.java +++ b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightClassForExplicitDeclaration.java @@ -306,4 +306,14 @@ public class KotlinLightClassForExplicitDeclaration extends AbstractLightClass i public PsiElement setName(@NonNls @NotNull String name) throws IncorrectOperationException { return super.setName(name); // TODO } + + @Override + public String toString() { + try { + return KotlinLightClass.class.getSimpleName() + ":" + getQualifiedName(); + } + catch (Throwable e) { + return KotlinLightClass.class.getSimpleName() + ":" + e.toString(); + } + } } diff --git a/idea/testData/search/annotations/testAnnotationsOnClass.kt b/idea/testData/search/annotations/testAnnotationsOnClass.kt index 4740f2e7a43..c93fef26160 100644 --- a/idea/testData/search/annotations/testAnnotationsOnClass.kt +++ b/idea/testData/search/annotations/testAnnotationsOnClass.kt @@ -11,6 +11,6 @@ class TestClass5 { } // ANNOTATION: java.lang.Deprecated -// SEARCH: JetLightClass:TestClass1, JetLightClass:TestClass2, JetLightClass:TestClass3 -// SEARCH: JetLightClass:TestClass4 -// SEARCH: JetLightClass:TestClass5.innerTestClass5 \ No newline at end of file +// SEARCH: KotlinLightClass:TestClass1, KotlinLightClass:TestClass2, KotlinLightClass:TestClass3 +// SEARCH: KotlinLightClass:TestClass4 +// SEARCH: KotlinLightClass:TestClass5.innerTestClass5 \ No newline at end of file diff --git a/idea/testData/search/annotations/testAnnotationsWithParameters.kt b/idea/testData/search/annotations/testAnnotationsWithParameters.kt index e717bbe982f..a947baa4c99 100644 --- a/idea/testData/search/annotations/testAnnotationsWithParameters.kt +++ b/idea/testData/search/annotations/testAnnotationsWithParameters.kt @@ -5,4 +5,4 @@ MyAnnotation("f", "s") class Test1() {} annotation class MyAnnotation(val first: String, val second: String) // ANNOTATION: MyAnnotation -// SEARCH: PsiMethod:test1, JetLightClass:Test1 \ No newline at end of file +// SEARCH: PsiMethod:test1, KotlinLightClass:Test1 \ No newline at end of file diff --git a/idea/testData/search/inheritance/testInheritanceFromJavaClass.kt b/idea/testData/search/inheritance/testInheritanceFromJavaClass.kt index cbd2cb6e764..9becf4db2fd 100644 --- a/idea/testData/search/inheritance/testInheritanceFromJavaClass.kt +++ b/idea/testData/search/inheritance/testInheritanceFromJavaClass.kt @@ -1,4 +1,4 @@ class A: Object() {} // CLASS: java.lang.Object -// SEARCH: JetLightClass:A +// SEARCH: KotlinLightClass:A diff --git a/idea/testData/search/inheritance/testInheritanceFromKotlinClass.kt b/idea/testData/search/inheritance/testInheritanceFromKotlinClass.kt index 9f9119c54af..f6b4066b2ce 100644 --- a/idea/testData/search/inheritance/testInheritanceFromKotlinClass.kt +++ b/idea/testData/search/inheritance/testInheritanceFromKotlinClass.kt @@ -3,4 +3,4 @@ class A: Base() {} open class Base() {} // CLASS: Base -// SEARCH: JetLightClass:A \ No newline at end of file +// SEARCH: KotlinLightClass:A \ No newline at end of file diff --git a/idea/testData/search/junit/testJunit3.kt b/idea/testData/search/junit/testJunit3.kt index fdde65f785b..789ec19cd12 100644 --- a/idea/testData/search/junit/testJunit3.kt +++ b/idea/testData/search/junit/testJunit3.kt @@ -9,4 +9,4 @@ class Test2: junit.framework.TestCase() { } // CLASS: junit.framework.TestCase -// SEARCH: JetLightClass:Test1, JetLightClass:Test2 \ No newline at end of file +// SEARCH: KotlinLightClass:Test1, KotlinLightClass:Test2 \ No newline at end of file