From 8ee4c05be6f41f710a58105e09648a538e3af3d7 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Thu, 7 Jun 2012 13:35:37 +0400 Subject: [PATCH] Support getClassDescriptor() --- .../jetbrains/jet/lang/resolve/lazy/ResolveSession.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ResolveSession.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ResolveSession.java index 0e57c7ef523..674e4fe4116 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ResolveSession.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ResolveSession.java @@ -17,7 +17,6 @@ package org.jetbrains.jet.lang.resolve.lazy; import com.google.common.collect.Lists; -import com.google.common.collect.Maps; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import com.intellij.psi.util.PsiTreeUtil; @@ -36,7 +35,6 @@ import org.jetbrains.jet.lang.resolve.scopes.JetScope; import java.util.Collection; import java.util.List; -import java.util.Map; import java.util.Set; /** @@ -49,7 +47,6 @@ public class ResolveSession { private final BindingTrace trace = new BindingTraceContext(); private final DeclarationProviderFactory declarationProviderFactory; - private final Map packageDescriptors = Maps.newHashMap(); private final InjectorForLazyResolve injector; public ResolveSession( @@ -93,8 +90,10 @@ public class ResolveSession { } @NotNull - public ClassDescriptor getClassDescriptor(JetClassOrObject classOrObject) { - throw new UnsupportedOperationException(); // TODO + public ClassDescriptor getClassDescriptor(@NotNull JetClassOrObject classOrObject) { + JetScope resolutionScope = getInjector().getScopeProvider().getResolutionScopeForDeclaration((JetDeclaration) classOrObject); + ClassifierDescriptor classifier = resolutionScope.getClassifier(classOrObject.getNameAsName()); + return (ClassDescriptor) classifier; } public Collection getDescriptorsForDeclarations(Collection declarationsOrFiles) {