From 3c71761cf32c90bd0c594bf7d920e91287704fe4 Mon Sep 17 00:00:00 2001 From: Nicolay Mitropolsky Date: Fri, 13 Jul 2018 15:26:49 +0300 Subject: [PATCH] lightAnnotations: check element validity before resolving call --- .../src/org/jetbrains/kotlin/asJava/elements/lightAnnotations.kt | 1 + .../org/jetbrains/kotlin/asJava/elements/lightAnnotations.kt.173 | 1 + 2 files changed, 2 insertions(+) diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/elements/lightAnnotations.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/elements/lightAnnotations.kt index 5eed4f86d7e..741a8a882f2 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/elements/lightAnnotations.kt +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/elements/lightAnnotations.kt @@ -341,6 +341,7 @@ private val backendNullabilityAnnotations = arrayOf(Nullable::class.java.name, N private fun KtElement.analyze(): BindingContext = LightClassGenerationSupport.getInstance(this.project).analyze(this) private fun KtElement.getResolvedCall(): ResolvedCall? { + if (!isValid) return null val context = analyze() return this.getResolvedCall(context) } diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/elements/lightAnnotations.kt.173 b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/elements/lightAnnotations.kt.173 index d7baf02db06..47d6f992449 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/elements/lightAnnotations.kt.173 +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/elements/lightAnnotations.kt.173 @@ -343,6 +343,7 @@ private val backendNullabilityAnnotations = arrayOf(Nullable::class.java.name, N private fun KtElement.analyze(): BindingContext = LightClassGenerationSupport.getInstance(this.project).analyze(this) private fun KtElement.getResolvedCall(): ResolvedCall? { + if (!isValid) return null val context = analyze() return this.getResolvedCall(context) }