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

Search for function in resolve session with non-physical file

Browse Source
This commit is contained in:
Nikolay Krasko
2012-08-13 20:13:25 +04:00
parent 365bb3ad8a
commit d1dc67c049
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/caches/JetShortNamesCache.java
+6 -5
View File
@@ -34,13 +34,15 @@ import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.asJava.JavaElementFinder; import org.jetbrains.jet.asJava.JavaElementFinder;
import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.descriptors.CallableDescriptor;
import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
import org.jetbrains.jet.lang.descriptors.FunctionDescriptor;
import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.psi.*;
import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingContext;
import org.jetbrains.jet.lang.resolve.BindingTraceContext; import org.jetbrains.jet.lang.resolve.BindingTraceContext;
import org.jetbrains.jet.lang.resolve.ImportPath; import org.jetbrains.jet.lang.resolve.ImportPath;
import org.jetbrains.jet.lang.resolve.QualifiedExpressionResolver; import org.jetbrains.jet.lang.resolve.QualifiedExpressionResolver;
import org.jetbrains.jet.lang.resolve.lazy.LazyBindingContextUtils;
import org.jetbrains.jet.lang.resolve.lazy.ResolveSession; import org.jetbrains.jet.lang.resolve.lazy.ResolveSession;
import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.FqName;
import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.resolve.scopes.JetScope;
@@ -159,8 +161,6 @@ public class JetShortNamesCache extends PsiShortNamesCache {
@NotNull GlobalSearchScope scope @NotNull GlobalSearchScope scope
) { ) {
JetFile jetFile = (JetFile) expression.getContainingFile(); JetFile jetFile = (JetFile) expression.getContainingFile();
final ResolveSession resolveSessionForFile = WholeProjectAnalyzerFacade.getLazyResolveSessionForFile(jetFile);
LazyBindingContextUtils.getExpressionBindingContext(resolveSessionForFile, expression);
BindingContext context = WholeProjectAnalyzerFacade.getLazyResolveContext(jetFile, expression); BindingContext context = WholeProjectAnalyzerFacade.getLazyResolveContext(jetFile, expression);
JetScope jetScope = context.get(BindingContext.RESOLUTION_SCOPE, expression); JetScope jetScope = context.get(BindingContext.RESOLUTION_SCOPE, expression);
@@ -187,7 +187,8 @@ public class JetShortNamesCache extends PsiShortNamesCache {
Collection<JetNamedFunction> jetNamedFunctions = JetShortFunctionNameIndex.getInstance().get(name, project, scope); Collection<JetNamedFunction> jetNamedFunctions = JetShortFunctionNameIndex.getInstance().get(name, project, scope);
for (JetNamedFunction jetNamedFunction : jetNamedFunctions) { for (JetNamedFunction jetNamedFunction : jetNamedFunctions) {
FunctionDescriptor functionDescriptor = (FunctionDescriptor) resolveSessionForFile.resolveToDescriptor(jetNamedFunction); ResolveSession resolveSession = WholeProjectAnalyzerFacade.getLazyResolveSessionForFile((JetFile)jetNamedFunction.getContainingFile());
FunctionDescriptor functionDescriptor = (FunctionDescriptor) resolveSession.resolveToDescriptor(jetNamedFunction);
result.add(functionDescriptor); result.add(functionDescriptor);
} }
idea/testData/completion/basic/multifile/TopLevelFunction-1.kt
+1 -1
View File
@@ -1,7 +1,7 @@
package first package first
fun firstFun() { fun firstFun() {
sec<caret> s<caret>
} }
// EXIST: secondFun // EXIST: secondFun
idea/testData/completion/basic/multifile/TopLevelFunction-2.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package second package first
fun secondFun() { fun secondFun() {
} }