From aee36c40cd88e974b8ec3f272eeb33602694c132 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Thu, 17 Dec 2015 15:36:16 +0300 Subject: [PATCH] Request resolve only for modifier list for suppression check --- .../idea/caches/resolve/KotlinCacheService.kt | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinCacheService.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinCacheService.kt index 80883965c1b..eb827968fc9 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinCacheService.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinCacheService.kt @@ -34,10 +34,7 @@ import org.jetbrains.kotlin.idea.project.TargetPlatformDetector import org.jetbrains.kotlin.idea.resolve.ResolutionFacade import org.jetbrains.kotlin.idea.util.ProjectRootsUtil import org.jetbrains.kotlin.js.resolve.JsPlatform -import org.jetbrains.kotlin.psi.KtAnnotated -import org.jetbrains.kotlin.psi.KtCodeFragment -import org.jetbrains.kotlin.psi.KtElement -import org.jetbrains.kotlin.psi.KtFile +import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.TargetPlatform import org.jetbrains.kotlin.resolve.diagnostics.KotlinSuppressCache @@ -167,13 +164,11 @@ public class KotlinCacheService(val project: Project) { return emptyList() } - val context = - if (annotated is KtFile) { - annotated.fileAnnotationList?.analyze(BodyResolveMode.PARTIAL) ?: return emptyList() - } - else { - annotated.analyze(BodyResolveMode.PARTIAL) - } + val context = when (annotated) { + is KtFile -> annotated.fileAnnotationList?.analyze(BodyResolveMode.PARTIAL) ?: return emptyList() + is KtModifierListOwner -> annotated.modifierList?.analyze(BodyResolveMode.PARTIAL) ?: return emptyList() + else -> annotated.analyze(BodyResolveMode.PARTIAL) + } val annotatedDescriptor = context.get(BindingContext.DECLARATION_TO_DESCRIPTOR, annotated)