From 6101b5e6bab622e4c6929a1fafd7e05f6cfb34e7 Mon Sep 17 00:00:00 2001 From: Nicolay Mitropolsky Date: Mon, 6 May 2019 15:09:39 +0300 Subject: [PATCH] KotlinAnnotatedElementsSearcher made support Kotlin objects (KT-31332) --- .../search/ideaExtensions/KotlinAnnotatedElementsSearcher.kt | 2 +- idea/testData/search/annotations/testAnnotationsOnClass.kt | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinAnnotatedElementsSearcher.kt b/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinAnnotatedElementsSearcher.kt index 42540c6e156..7052951309f 100644 --- a/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinAnnotatedElementsSearcher.kt +++ b/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinAnnotatedElementsSearcher.kt @@ -49,7 +49,7 @@ class KotlinAnnotatedElementsSearcher : QueryExecutor): Boolean { return processAnnotatedMembers(p.annotationClass, p.scope) { declaration -> when (declaration) { - is KtClass -> { + is KtClassOrObject -> { val lightClass = declaration.toLightClass() consumer.process(lightClass) } diff --git a/idea/testData/search/annotations/testAnnotationsOnClass.kt b/idea/testData/search/annotations/testAnnotationsOnClass.kt index 3d92607e25a..d75e8d8365c 100644 --- a/idea/testData/search/annotations/testAnnotationsOnClass.kt +++ b/idea/testData/search/annotations/testAnnotationsOnClass.kt @@ -6,6 +6,9 @@ @java.lang.Deprecated class TestClass4 {} +@java.lang.Deprecated +object TestObject {} + class TestClass5 { @java.lang.Deprecated class innerTestClass5() {} } @@ -13,4 +16,5 @@ class TestClass5 { // ANNOTATION: java.lang.Deprecated // SEARCH: class:TestClass1, class:TestClass2, class:TestClass3 // SEARCH: class:TestClass4 +// SEARCH: class:TestObject // SEARCH: class:innerTestClass5 \ No newline at end of file