Fix imports from objects

This almost reverts 345ecbf, since now properties are no longer created for objects
2013-11-21 17:28:00 +04:00
parent dce9fbb91c
commit 92cdb0b6e7
4 changed files with 3 additions and 12 deletions
@@ -148,7 +148,6 @@ public interface Importer {

        @Override
        public void addAliasImport(@NotNull DeclarationDescriptor descriptor, @NotNull Name aliasName) {
-            assert !DescriptorUtils.isSingleton(descriptor) : "Never import objects: " + descriptor;
            imports.add(new AliasImportEntry(descriptor, aliasName));
        }

@@ -111,9 +111,7 @@ public class QualifiedExpressionResolver {
        }

        for (DeclarationDescriptor descriptor : descriptors) {
-            if (!DescriptorUtils.isSingleton(descriptor)) {
-                importer.addAliasImport(descriptor, aliasName);
-            }
+            importer.addAliasImport(descriptor, aliasName);
        }

        return descriptors;