KT-11588 Type aliases

Type alias companion object
2016-05-23 14:41:07 +03:00
parent 8c2e80f9eb
commit 4a9507b3ab
7 changed files with 159 additions and 3 deletions
@@ -243,9 +243,16 @@ private fun ResolutionScope.getContributedVariablesAndObjects(name: Name, locati


 private fun getFakeDescriptorForObject(classifier: ClassifierDescriptor?): FakeCallableDescriptorForObject? {
-    if (classifier !is ClassDescriptor || !classifier.hasClassValueDescriptor) return null // todo
-
-    return FakeCallableDescriptorForObject(classifier)
+    return when (classifier) {
+        is TypeAliasDescriptor ->
+            getFakeDescriptorForObject(classifier.classDescriptor)
+        is ClassDescriptor ->
+            if (classifier.hasClassValueDescriptor)
+                FakeCallableDescriptorForObject(classifier)
+            else
+                null
+        else -> null
+    }
 }

 private fun getClassWithConstructors(classifier: ClassifierDescriptor?): ClassDescriptor? {