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

Do reference resolution with lazy resolve

Browse Source
This commit is contained in:
Nikolay Krasko
2013-06-10 18:40:36 +04:00
parent 2621df3243
commit 642def0133
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/project/WholeProjectAnalyzerFacade.java
+8
View File
@@ -18,8 +18,11 @@ package org.jetbrains.jet.plugin.project;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.analyzer.AnalyzeExhaust; import org.jetbrains.jet.analyzer.AnalyzeExhaust;
import org.jetbrains.jet.lang.psi.JetExpression;
import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.jet.lang.resolve.BindingContext;
import org.jetbrains.jet.lang.resolve.lazy.ResolveSession; import org.jetbrains.jet.lang.resolve.lazy.ResolveSession;
import org.jetbrains.jet.lang.resolve.lazy.ResolveSessionUtils;
public final class WholeProjectAnalyzerFacade { public final class WholeProjectAnalyzerFacade {
@@ -35,4 +38,9 @@ public final class WholeProjectAnalyzerFacade {
public static ResolveSession getLazyResolveSessionForFile(@NotNull JetFile file) { public static ResolveSession getLazyResolveSessionForFile(@NotNull JetFile file) {
return AnalyzerFacadeWithCache.getLazyResolveSession(file); return AnalyzerFacadeWithCache.getLazyResolveSession(file);
} }
public static BindingContext getContextForExpression(@NotNull JetExpression jetExpression) {
ResolveSession resolveSession = getLazyResolveSessionForFile((JetFile) jetExpression.getContainingFile());
return ResolveSessionUtils.resolveToExpression(resolveSession, jetExpression);
}
} }
idea/src/org/jetbrains/jet/plugin/references/JetPsiReference.java
+4 -4
View File
@@ -102,16 +102,16 @@ public abstract class JetPsiReference implements PsiPolyVariantReference {
@Nullable @Nullable
protected PsiElement doResolve() { protected PsiElement doResolve() {
JetFile file = (JetFile) getElement().getContainingFile(); BindingContext context = WholeProjectAnalyzerFacade.getContextForExpression(myExpression);
BindingContext bindingContext = WholeProjectAnalyzerFacade.analyzeProjectWithCacheOnAFile(file).getBindingContext();
List<PsiElement> psiElements = BindingContextUtils.resolveToDeclarationPsiElements(bindingContext, myExpression); List<PsiElement> psiElements = BindingContextUtils.resolveToDeclarationPsiElements(context, myExpression);
if (psiElements.size() == 1) { if (psiElements.size() == 1) {
return psiElements.iterator().next(); return psiElements.iterator().next();
} }
if (psiElements.size() > 1) { if (psiElements.size() > 1) {
return null; return null;
} }
Collection<PsiElement> stdlibSymbols = resolveStandardLibrarySymbol(bindingContext); Collection<PsiElement> stdlibSymbols = resolveStandardLibrarySymbol(context);
if (stdlibSymbols.size() == 1) { if (stdlibSymbols.size() == 1) {
return stdlibSymbols.iterator().next(); return stdlibSymbols.iterator().next();
} }