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

Fix imports from objects

Browse Source 
This almost reverts 345ecbf, since now properties are no longer created for
objects
This commit is contained in:
Alexander Udalov
2013-11-21 17:28:00 +04:00
parent dce9fbb91c
commit 92cdb0b6e7
4 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/Importer.java
-1
View File
@@ -148,7 +148,6 @@ public interface Importer {
@Override @Override
public void addAliasImport(@NotNull DeclarationDescriptor descriptor, @NotNull Name aliasName) { public void addAliasImport(@NotNull DeclarationDescriptor descriptor, @NotNull Name aliasName) {
assert !DescriptorUtils.isSingleton(descriptor) : "Never import objects: " + descriptor;
imports.add(new AliasImportEntry(descriptor, aliasName)); imports.add(new AliasImportEntry(descriptor, aliasName));
} }
compiler/frontend/src/org/jetbrains/jet/lang/resolve/QualifiedExpressionResolver.java
+1 -3
View File
@@ -111,9 +111,7 @@ public class QualifiedExpressionResolver {
} }
for (DeclarationDescriptor descriptor : descriptors) { for (DeclarationDescriptor descriptor : descriptors) {
if (!DescriptorUtils.isSingleton(descriptor)) { importer.addAliasImport(descriptor, aliasName);
importer.addAliasImport(descriptor, aliasName);
}
} }
return descriptors; return descriptors;
compiler/testData/diagnostics/tests/scopes/ImportObjectAndUseAsSupertype.kt
+1 -1
View File
@@ -12,7 +12,7 @@ package baz
import foo.Bar import foo.Bar
class C: <!UNRESOLVED_REFERENCE!>Bar<!> class C: <!SUPERTYPE_NOT_INITIALIZED, FINAL_SUPERTYPE!>Bar<!>
fun test() { fun test() {
Bar.bar() Bar.bar()
core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeWithImports.java
+1 -7
View File
@@ -22,7 +22,6 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.TestOnly; import org.jetbrains.annotations.TestOnly;
import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.descriptors.*;
import org.jetbrains.jet.lang.resolve.DescriptorUtils;
import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.resolve.name.Name;
import org.jetbrains.jet.utils.Printer; import org.jetbrains.jet.utils.Printer;
@@ -203,14 +202,9 @@ public abstract class WritableScopeWithImports extends JetScopeAdapter implement
public void importClassifierAlias(@NotNull Name importedClassifierName, @NotNull ClassifierDescriptor classifierDescriptor) { public void importClassifierAlias(@NotNull Name importedClassifierName, @NotNull ClassifierDescriptor classifierDescriptor) {
checkMayWrite(); checkMayWrite();
if (DescriptorUtils.isSingleton(classifierDescriptor)) {
throw new IllegalStateException("must not be object: " + classifierDescriptor);
}
getCurrentIndividualImportScope().addClassifierAlias(importedClassifierName, classifierDescriptor); getCurrentIndividualImportScope().addClassifierAlias(importedClassifierName, classifierDescriptor);
} }
@Override @Override
public void importNamespaceAlias(@NotNull Name aliasName, @NotNull NamespaceDescriptor namespaceDescriptor) { public void importNamespaceAlias(@NotNull Name aliasName, @NotNull NamespaceDescriptor namespaceDescriptor) {
checkMayWrite(); checkMayWrite();