azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed EA-70940

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-07-28 13:16:10 +03:00
parent eb03c5a6d0
commit 4355b3ed00
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinResolveCache.kt
+1
View File
@@ -84,6 +84,7 @@ private class KotlinResolveCache(
}, false) }, false)
fun getAnalysisResultsForElements(elements: Collection<JetElement>): AnalysisResult { fun getAnalysisResultsForElements(elements: Collection<JetElement>): AnalysisResult {
assert(elements.isNotEmpty(), "elements collection should not be empty")
val slruCache = synchronized(analysisResults) { val slruCache = synchronized(analysisResults) {
analysisResults.getValue()!! analysisResults.getValue()!!
} }
idea/src/org/jetbrains/kotlin/idea/j2k/J2kPostProcessor.kt
+1 -1
View File
@@ -19,7 +19,6 @@ package org.jetbrains.kotlin.idea.j2k
import com.intellij.openapi.editor.RangeMarker import com.intellij.openapi.editor.RangeMarker
import com.intellij.openapi.util.TextRange import com.intellij.openapi.util.TextRange
import com.intellij.psi.PsiElement import com.intellij.psi.PsiElement
import com.intellij.psi.PsiReference
import com.intellij.psi.codeStyle.CodeStyleManager import com.intellij.psi.codeStyle.CodeStyleManager
import com.intellij.psi.search.LocalSearchScope import com.intellij.psi.search.LocalSearchScope
import com.intellij.psi.search.searches.ReferencesSearch import com.intellij.psi.search.searches.ReferencesSearch
@@ -52,6 +51,7 @@ public class J2kPostProcessor(private val formatCode: Boolean) : PostProcessor {
else { else {
file.elementsInRange(range).filterIsInstance<JetElement>() file.elementsInRange(range).filterIsInstance<JetElement>()
} }
if (elements.isEmpty()) return BindingContext.EMPTY
return file.getResolutionFacade().analyzeFullyAndGetResult(elements).bindingContext return file.getResolutionFacade().analyzeFullyAndGetResult(elements).bindingContext
} }