diff --git a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedClassDescriptor.java b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedClassDescriptor.java index fe89dfb9ec3..150dc5f5250 100644 --- a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedClassDescriptor.java +++ b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedClassDescriptor.java @@ -358,6 +358,11 @@ public class DeserializedClassDescriptor extends ClassDescriptorBase implements return !getModality().isOverridable(); } + @Override + public boolean isDenotable() { + return true; + } + @Nullable @Override public ClassifierDescriptor getDeclarationDescriptor() { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/AbstractLazyTypeParameterDescriptor.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/AbstractLazyTypeParameterDescriptor.java index fbc55608ba4..ac76a656cf2 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/AbstractLazyTypeParameterDescriptor.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/AbstractLazyTypeParameterDescriptor.java @@ -168,6 +168,11 @@ public abstract class AbstractLazyTypeParameterDescriptor implements TypeParamet return false; } + @Override + public boolean isDenotable() { + return true; + } + @Override public ClassifierDescriptor getDeclarationDescriptor() { return AbstractLazyTypeParameterDescriptor.this; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassDescriptor.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassDescriptor.java index ae0f98c2c17..a4acb5246f0 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassDescriptor.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassDescriptor.java @@ -478,6 +478,11 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements LazyDesc return !getModality().isOverridable(); } + @Override + public boolean isDenotable() { + return true; + } + @Override public ClassifierDescriptor getDeclarationDescriptor() { return LazyClassDescriptor.this; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/IntersectionTypeConstructor.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/IntersectionTypeConstructor.java index 7632b9992e4..1d2845bfe2e 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/IntersectionTypeConstructor.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/IntersectionTypeConstructor.java @@ -53,6 +53,11 @@ public class IntersectionTypeConstructor extends AnnotatedImpl implements TypeCo return false; } + @Override + public boolean isDenotable() { + return false; + } + @Override public ClassifierDescriptor getDeclarationDescriptor() { return null; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/TypeConstructor.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/TypeConstructor.java index 8eb128f0f87..c2530e166d2 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/TypeConstructor.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/TypeConstructor.java @@ -34,6 +34,8 @@ public interface TypeConstructor extends Annotated { boolean isSealed(); + boolean isDenotable(); + @Nullable ClassifierDescriptor getDeclarationDescriptor(); } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/TypeConstructorImpl.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/TypeConstructorImpl.java index d0b0891c607..18cc84dd689 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/TypeConstructorImpl.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/TypeConstructorImpl.java @@ -74,6 +74,11 @@ public class TypeConstructorImpl extends AnnotatedImpl implements TypeConstructo return sealed; } + @Override + public boolean isDenotable() { + return true; + } + @Override @Nullable public ClassifierDescriptor getDeclarationDescriptor() {