From 4355b3ed0090cff85baa3d45f5a25774c5bcba79 Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Tue, 28 Jul 2015 13:16:10 +0300 Subject: [PATCH] Fixed EA-70940 --- .../jetbrains/kotlin/idea/caches/resolve/KotlinResolveCache.kt | 1 + idea/src/org/jetbrains/kotlin/idea/j2k/J2kPostProcessor.kt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinResolveCache.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinResolveCache.kt index 5fbddcc590e..5e34d92538a 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinResolveCache.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinResolveCache.kt @@ -84,6 +84,7 @@ private class KotlinResolveCache( }, false) fun getAnalysisResultsForElements(elements: Collection): AnalysisResult { + assert(elements.isNotEmpty(), "elements collection should not be empty") val slruCache = synchronized(analysisResults) { analysisResults.getValue()!! } diff --git a/idea/src/org/jetbrains/kotlin/idea/j2k/J2kPostProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/j2k/J2kPostProcessor.kt index 62f4bdd45a0..690acd170ca 100644 --- a/idea/src/org/jetbrains/kotlin/idea/j2k/J2kPostProcessor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/j2k/J2kPostProcessor.kt @@ -19,7 +19,6 @@ package org.jetbrains.kotlin.idea.j2k import com.intellij.openapi.editor.RangeMarker import com.intellij.openapi.util.TextRange import com.intellij.psi.PsiElement -import com.intellij.psi.PsiReference import com.intellij.psi.codeStyle.CodeStyleManager import com.intellij.psi.search.LocalSearchScope import com.intellij.psi.search.searches.ReferencesSearch @@ -52,6 +51,7 @@ public class J2kPostProcessor(private val formatCode: Boolean) : PostProcessor { else { file.elementsInRange(range).filterIsInstance() } + if (elements.isEmpty()) return BindingContext.EMPTY return file.getResolutionFacade().analyzeFullyAndGetResult(elements).bindingContext }