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

Got rid of hardcoded "jet" and "jet.Tuple0" constants in StandardLibraryReferenceResolver.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-05-15 12:30:28 +04:00
parent 1b516d2786
commit 151b3be99e
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/references/StandardLibraryReferenceResolver.java
+8 -6
View File
@@ -38,6 +38,7 @@ import org.jetbrains.jet.lang.resolve.scopes.JetScope;
import org.jetbrains.jet.lang.resolve.scopes.RedeclarationHandler; import org.jetbrains.jet.lang.resolve.scopes.RedeclarationHandler;
import org.jetbrains.jet.lang.resolve.scopes.WritableScope; import org.jetbrains.jet.lang.resolve.scopes.WritableScope;
import org.jetbrains.jet.lang.resolve.scopes.WritableScopeImpl; import org.jetbrains.jet.lang.resolve.scopes.WritableScopeImpl;
import org.jetbrains.jet.lang.types.lang.JetStandardClasses;
import org.jetbrains.jet.resolve.DescriptorRenderer; import org.jetbrains.jet.resolve.DescriptorRenderer;
import java.net.URL; import java.net.URL;
@@ -49,6 +50,7 @@ public class StandardLibraryReferenceResolver extends AbstractProjectComponent {
private BindingContext bindingContext = null; private BindingContext bindingContext = null;
private final Object lock = new Object(); private final Object lock = new Object();
private static final FqName TUPLE0_FQ_NAME = DescriptorUtils.getFQName(JetStandardClasses.getTuple(0)).toSafe();
public StandardLibraryReferenceResolver(Project project) { public StandardLibraryReferenceResolver(Project project) {
super(project); super(project);
@@ -72,7 +74,7 @@ public class StandardLibraryReferenceResolver extends AbstractProjectComponent {
BindingTraceContext context = new BindingTraceContext(); BindingTraceContext context = new BindingTraceContext();
FakeJetNamespaceDescriptor jetNamespace = new FakeJetNamespaceDescriptor(); FakeJetNamespaceDescriptor jetNamespace = new FakeJetNamespaceDescriptor();
context.record(BindingContext.FQNAME_TO_NAMESPACE_DESCRIPTOR, new FqName("jet"), jetNamespace); context.record(BindingContext.FQNAME_TO_NAMESPACE_DESCRIPTOR, JetStandardClasses.STANDARD_CLASSES_FQNAME, jetNamespace);
WritableScopeImpl scope = new WritableScopeImpl(JetScope.EMPTY, jetNamespace, RedeclarationHandler.THROW_EXCEPTION) WritableScopeImpl scope = new WritableScopeImpl(JetScope.EMPTY, jetNamespace, RedeclarationHandler.THROW_EXCEPTION)
.setDebugName("Builtin classes scope"); .setDebugName("Builtin classes scope");
@@ -81,7 +83,7 @@ public class StandardLibraryReferenceResolver extends AbstractProjectComponent {
TopDownAnalyzer.processStandardLibraryNamespace(myProject, context, scope, jetNamespace, getJetFiles("jet.src")); TopDownAnalyzer.processStandardLibraryNamespace(myProject, context, scope, jetNamespace, getJetFiles("jet.src"));
ClassDescriptor tuple0 = context.get(BindingContext.FQNAME_TO_CLASS_DESCRIPTOR, new FqName("jet.Tuple0")); ClassDescriptor tuple0 = context.get(BindingContext.FQNAME_TO_CLASS_DESCRIPTOR, TUPLE0_FQ_NAME);
assert tuple0 != null; assert tuple0 != null;
scope = new WritableScopeImpl(scope, jetNamespace, RedeclarationHandler.THROW_EXCEPTION).setDebugName("Builtin classes scope #2"); scope = new WritableScopeImpl(scope, jetNamespace, RedeclarationHandler.THROW_EXCEPTION).setDebugName("Builtin classes scope #2");
scope.changeLockLevel(WritableScope.LockLevel.BOTH); scope.changeLockLevel(WritableScope.LockLevel.BOTH);
@@ -134,7 +136,7 @@ public class StandardLibraryReferenceResolver extends AbstractProjectComponent {
} }
String renderedOriginal = DescriptorRenderer.TEXT.render(originalDescriptor); String renderedOriginal = DescriptorRenderer.TEXT.render(originalDescriptor);
for (DeclarationDescriptor member : memberScope.getAllDescriptors()) { for (DeclarationDescriptor member : memberScope.getAllDescriptors()) {
if (renderedOriginal.equals(DescriptorRenderer.TEXT.render(member).replace("jet.Tuple0", "Unit"))) { if (renderedOriginal.equals(DescriptorRenderer.TEXT.render(member).replace(TUPLE0_FQ_NAME.getFqName(), "Unit"))) {
return member; return member;
} }
} }
@@ -167,9 +169,9 @@ public class StandardLibraryReferenceResolver extends AbstractProjectComponent {
private WritableScope memberScope; private WritableScope memberScope;
private FakeJetNamespaceDescriptor() { private FakeJetNamespaceDescriptor() {
super(new NamespaceDescriptorImpl(new ModuleDescriptor("<fake_module>"), super(new NamespaceDescriptorImpl(new ModuleDescriptor("<fake_module>"), Collections.<AnnotationDescriptor>emptyList(), "<root>"),
Collections.<AnnotationDescriptor>emptyList(), Collections.<AnnotationDescriptor>emptyList(),
"<root>"), Collections.<AnnotationDescriptor>emptyList(), "jet"); JetStandardClasses.STANDARD_CLASSES_NAMESPACE.getName());
} }
void setMemberScope(WritableScope memberScope) { void setMemberScope(WritableScope memberScope) {