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

EA-39003 - ISE: ResolveSession.resolveToDescriptor

Browse Source 
Lokking up classes and objects by PSI element, rather than by name
This commit is contained in:
Andrey Breslav
2012-11-16 17:15:24 +04:00
parent 96c1564c54
commit a71ea5c6db
13 changed files with 143 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyMemberScope.java
+27 -19
View File
@@ -65,21 +65,27 @@ public abstract class AbstractLazyMemberScope<D extends DeclarationDescriptor, D
if (allDescriptorsComputed) return null;
JetClassOrObject classOrObjectDeclaration = declarationProvider.getClassOrObjectDeclaration(name);
if (classOrObjectDeclaration == null) return null;
Collection<JetClassOrObject> classOrObjectDeclarations = declarationProvider.getClassOrObjectDeclarations(name);
if (classOrObjectDeclarations.isEmpty()) return null;
// TODO: when enum entries with constructors are dropped, replace with declaresObjectOrEnumConstant()
if (object != declaresObjectOrEnumConstant(classOrObjectDeclaration)) return null;
ClassDescriptor result = null;
ClassDescriptor classDescriptor = new LazyClassDescriptor(resolveSession, thisDescriptor, name,
JetClassInfoUtil.createClassLikeInfo(classOrObjectDeclaration));
for (JetClassOrObject classOrObjectDeclaration : classOrObjectDeclarations) {
cache.put(name, classDescriptor);
if (!object) {
allDescriptors.add(classDescriptor);
// TODO: when enum entries with constructors are dropped, replace with declaresObjectOrEnumConstant()
if (object != declaresObjectOrEnumConstant(classOrObjectDeclaration)) continue;
ClassDescriptor classDescriptor = new LazyClassDescriptor(resolveSession, thisDescriptor, name,
JetClassInfoUtil.createClassLikeInfo(classOrObjectDeclaration));
cache.put(name, classDescriptor);
if (!object) {
allDescriptors.add(classDescriptor);
}
result = classDescriptor;
}
return classDescriptor;
return result;
}
private static boolean declaresObjectOrEnumConstant(JetClassOrObject declaration) {
@@ -149,15 +155,17 @@ public abstract class AbstractLazyMemberScope<D extends DeclarationDescriptor, D
}
// Objects are also properties
JetClassOrObject classOrObjectDeclaration = declarationProvider.getClassOrObjectDeclaration(name);
if (declaresObjectOrEnumConstant(classOrObjectDeclaration)) {
ClassDescriptor classifier = getObjectDescriptor(name);
if (classifier == null) {
throw new IllegalStateException("Object declaration " + name + " found in the DeclarationProvider " + declarationProvider + " but not in the scope " + this);
Collection<JetClassOrObject> classOrObjectDeclarations = declarationProvider.getClassOrObjectDeclarations(name);
for (JetClassOrObject classOrObjectDeclaration : classOrObjectDeclarations) {
if (declaresObjectOrEnumConstant(classOrObjectDeclaration)) {
ClassDescriptor classifier = getObjectDescriptor(name);
if (classifier == null) {
throw new IllegalStateException("Object declaration " + name + " found in the DeclarationProvider " + declarationProvider + " but not in the scope " + this);
}
VariableDescriptor propertyDescriptor = resolveSession.getInjector().getDescriptorResolver()
.resolveObjectDeclaration(thisDescriptor, classOrObjectDeclaration, classifier, resolveSession.getTrace());
result.add(propertyDescriptor);
}
VariableDescriptor propertyDescriptor = resolveSession.getInjector().getDescriptorResolver()
.resolveObjectDeclaration(thisDescriptor, classOrObjectDeclaration, classifier, resolveSession.getTrace());
result.add(propertyDescriptor);
}
getNonDeclaredProperties(name, result);
compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/AbstractPsiBasedDeclarationProvider.java
+5 -4
View File
@@ -16,16 +16,16 @@
package org.jetbrains.jet.lang.resolve.lazy;
import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Multimap;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.psi.*;
import org.jetbrains.jet.lang.resolve.name.Name;
import java.util.Collection;
import java.util.List;
import java.util.Map;
/**
* @author abreslav
@@ -34,7 +34,7 @@ public abstract class AbstractPsiBasedDeclarationProvider implements Declaration
private final List<JetDeclaration> allDeclarations = Lists.newArrayList();
private final Multimap<Name, JetNamedFunction> functions = HashMultimap.create();
private final Multimap<Name, JetProperty> properties = HashMultimap.create();
private final Map<Name, JetClassOrObject> classesAndObjects = Maps.newHashMap();
private final Multimap<Name, JetClassOrObject> classesAndObjects = ArrayListMultimap.create(); // order matters here
private boolean indexCreated = false;
@@ -92,8 +92,9 @@ public abstract class AbstractPsiBasedDeclarationProvider implements Declaration
return Lists.newArrayList(properties.get(name));
}
@NotNull
@Override
public JetClassOrObject getClassOrObjectDeclaration(@NotNull Name name) {
public Collection<JetClassOrObject> getClassOrObjectDeclarations(@NotNull Name name) {
createIndex();
return classesAndObjects.get(name);
}
compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/DeclarationProvider.java
+2 -3
View File
@@ -17,7 +17,6 @@
package org.jetbrains.jet.lang.resolve.lazy;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.psi.JetClassOrObject;
import org.jetbrains.jet.lang.psi.JetDeclaration;
import org.jetbrains.jet.lang.psi.JetNamedFunction;
@@ -39,6 +38,6 @@ public interface DeclarationProvider {
@NotNull
Collection<JetProperty> getPropertyDeclarations(@NotNull Name name);
@Nullable
JetClassOrObject getClassOrObjectDeclaration(@NotNull Name name);
@NotNull
Collection<JetClassOrObject> getClassOrObjectDeclarations(@NotNull Name name);
}
compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/EmptyPackageMemberDeclarationProvider.java
+3 -2
View File
@@ -64,8 +64,9 @@ public class EmptyPackageMemberDeclarationProvider implements PackageMemberDecla
return Collections.emptyList();
}
@NotNull
@Override
public JetClassOrObject getClassOrObjectDeclaration(@NotNull Name name) {
return null;
public Collection<JetClassOrObject> getClassOrObjectDeclarations(@NotNull Name name) {
return Collections.emptyList();
}
}
compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ResolveSession.java
+15 -9
View File
@@ -28,10 +28,7 @@ import org.jetbrains.jet.di.InjectorForLazyResolve;
import org.jetbrains.jet.lang.ModuleConfiguration;
import org.jetbrains.jet.lang.descriptors.*;
import org.jetbrains.jet.lang.psi.*;
import org.jetbrains.jet.lang.resolve.BindingContext;
import org.jetbrains.jet.lang.resolve.BindingTrace;
import org.jetbrains.jet.lang.resolve.BindingTraceContext;
import org.jetbrains.jet.lang.resolve.ObservableBindingTrace;
import org.jetbrains.jet.lang.resolve.*;
import org.jetbrains.jet.lang.resolve.name.FqName;
import org.jetbrains.jet.lang.resolve.name.FqNameUnsafe;
import org.jetbrains.jet.lang.resolve.name.Name;
@@ -158,14 +155,23 @@ public class ResolveSession {
JetScope resolutionScope = getInjector().getScopeProvider().getResolutionScopeForDeclaration(classOrObject);
Name name = classOrObject.getNameAsName();
assert name != null : "Name is null for " + classOrObject + " " + classOrObject.getText();
ClassifierDescriptor classifier = resolutionScope.getClassifier(name);
if (classifier == null) {
classifier = resolutionScope.getObjectDescriptor(name);
// Why not use the result here. Because it may be that there is a redeclaration:
// class A {} class A { fun foo(): A<completion here>}
// and if we find teh class by name only, we may b-not get the right one.
// This call is only needed to make sure the classes are written to trace
resolutionScope.getClassifier(name);
DeclarationDescriptor declaration = getBindingContext().get(BindingContext.DECLARATION_TO_DESCRIPTOR, classOrObject);
if (declaration == null) {
// Why not use the result here. See the comment
resolutionScope.getObjectDescriptor(name);
declaration = getBindingContext().get(BindingContext.DECLARATION_TO_DESCRIPTOR, classOrObject);
}
if (classifier == null) {
if (declaration == null) {
throw new IllegalArgumentException("Could not find a classifier for " + classOrObject + " " + classOrObject.getText());
}
return (ClassDescriptor) classifier;
return (ClassDescriptor) declaration;
}
/*package*/ LazyClassDescriptor getClassObjectDescriptor(JetClassObject classObject) {
compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ResolveSessionUtils.java
+30 -6
View File
@@ -308,7 +308,20 @@ public class ResolveSessionUtils {
return null;
}
public static Collection<ClassDescriptor> getClassDescriptorsByFqName(@NotNull ResolveSession resolveSession, @NotNull FqName fqName) {
@NotNull
public static Collection<ClassDescriptor> getClassDescriptorsByFqName(
@NotNull ResolveSession resolveSession,
@NotNull FqName fqName
) {
return getClassOrObjectDescriptorsByFqName(resolveSession, fqName, false);
}
@NotNull
public static Collection<ClassDescriptor> getClassOrObjectDescriptorsByFqName(
@NotNull ResolveSession resolveSession,
@NotNull FqName fqName,
boolean includeObjectDeclarations
) {
if (fqName.isRoot()) {
return Collections.emptyList();
}
@@ -320,7 +333,8 @@ public class ResolveSessionUtils {
NamespaceDescriptor packageDescriptor = resolveSession.getPackageDescriptorByFqName(packageFqName);
if (packageDescriptor != null) {
FqName classInPackagePath = new FqName(QualifiedNamesUtil.tail(packageFqName, fqName));
Collection<ClassDescriptor> descriptors = getClassDescriptorsByFqName(packageDescriptor, classInPackagePath);
Collection<ClassDescriptor> descriptors = getClassOrObjectDescriptorsByFqName(packageDescriptor, classInPackagePath,
includeObjectDeclarations);
classDescriptors.addAll(descriptors);
}
@@ -335,7 +349,11 @@ public class ResolveSessionUtils {
return classDescriptors;
}
private static Collection<ClassDescriptor> getClassDescriptorsByFqName(NamespaceDescriptor packageDescriptor, FqName path) {
private static Collection<ClassDescriptor> getClassOrObjectDescriptorsByFqName(
NamespaceDescriptor packageDescriptor,
FqName path,
boolean includeObjectDeclarations
) {
if (path.isRoot()) {
return Collections.emptyList();
}
@@ -358,14 +376,20 @@ public class ResolveSessionUtils {
}
Name shortName = path.shortName();
Collection<ClassDescriptor> resultClassDescriptors = Lists.newArrayList();
Collection<ClassDescriptor> resultClassifierDescriptors = Lists.newArrayList();
for (JetScope scope : scopes) {
ClassifierDescriptor classifier = scope.getClassifier(shortName);
if (classifier instanceof ClassDescriptor) {
resultClassDescriptors.add((ClassDescriptor) classifier);
resultClassifierDescriptors.add((ClassDescriptor) classifier);
}
if (includeObjectDeclarations) {
ClassDescriptor objectDescriptor = scope.getObjectDescriptor(shortName);
if (objectDescriptor != null) {
resultClassifierDescriptors.add(objectDescriptor);
}
}
}
return resultClassDescriptors;
return resultClassifierDescriptors;
}
}
idea/src/org/jetbrains/jet/plugin/caches/JetShortNamesCache.java
+4 -2
View File
@@ -158,7 +158,9 @@ public class JetShortNamesCache extends PsiShortNamesCache {
Collection<JetObjectDeclaration> topObjects = JetTopLevelShortObjectNameIndex.getInstance().get(name, project, scope);
for (JetObjectDeclaration objectDeclaration : topObjects) {
result.add(resolveSession.getClassDescriptor(objectDeclaration));
FqName fqName = JetPsiUtil.getFQName(objectDeclaration);
assert fqName != null : "Local object declaration in JetTopLevelShortObjectNameIndex:" + objectDeclaration.getText();
result.addAll(ResolveSessionUtils.getClassOrObjectDescriptorsByFqName(resolveSession, fqName, true));
}
for (PsiClass psiClass : JetFromJavaDescriptorHelper
@@ -166,7 +168,7 @@ public class JetShortNamesCache extends PsiShortNamesCache {
String qualifiedName = psiClass.getQualifiedName();
if (qualifiedName != null) {
FqName fqName = new FqName(qualifiedName);
result.addAll(ResolveSessionUtils.getClassDescriptorsByFqName(resolveSession, fqName));
result.addAll(ResolveSessionUtils.getClassOrObjectDescriptorsByFqName(resolveSession, fqName, true));
}
}
idea/src/org/jetbrains/jet/plugin/stubindex/resolve/AbstractStubDeclarationProvider.java
+5 -2
View File
@@ -22,6 +22,8 @@ import org.jetbrains.jet.lang.psi.JetDeclaration;
import org.jetbrains.jet.lang.resolve.lazy.DeclarationProvider;
import org.jetbrains.jet.lang.resolve.name.Name;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
/**
@@ -34,9 +36,10 @@ public abstract class AbstractStubDeclarationProvider implements DeclarationProv
return null;
}
@NotNull
@Override
public JetClassOrObject getClassOrObjectDeclaration(@NotNull Name name) {
public Collection<JetClassOrObject> getClassOrObjectDeclarations(@NotNull Name name) {
// TODO:
return null;
return Collections.emptyList();
}
}
idea/testData/completion/basic/ClassRedeclaration1.kt
+9
View File
@@ -0,0 +1,9 @@
class A {
fun f() : A<caret>
}
class A {
fun f() : A
}
// EXIST: A
idea/testData/completion/basic/ClassRedeclaration2.kt
+9
View File
@@ -0,0 +1,9 @@
class A {
fun f() : A
}
class A {
fun f() : A<caret>
}
// EXIST: A
idea/testData/completion/basic/ObjectRedeclaration1.kt
+9
View File
@@ -0,0 +1,9 @@
object A {
fun f() : S<caret>
}
object A {
fun f() : S
}
// EXIST: String
idea/testData/completion/basic/ObjectRedeclaration2.kt
+9
View File
@@ -0,0 +1,9 @@
object A {
fun f() : S
}
object A {
fun f() : S<caret>
}
// EXIST: String
idea/tests/org/jetbrains/jet/completion/JetBasicCompletionTest.java
+16
View File
@@ -269,6 +269,22 @@ public class JetBasicCompletionTest extends JetCompletionTestBase {
doTest();
}
public void testClassRedeclaration1() {
doTest();
}
public void testClassRedeclaration2() {
doTest();
}
public void testObjectRedeclaration1() {
doTest();
}
public void testObjectRedeclaration2() {
doTest();
}
@NotNull
@Override
protected String getTestDataPath() {