From 15c47ead97515bc7e2473a19ecfc93be035714f4 Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Fri, 20 May 2016 12:18:03 +0300 Subject: [PATCH] (minor) KT-11588 Type aliases: fix conflicts after rebase. --- .../src/org/jetbrains/kotlin/resolve/DescriptorResolver.java | 2 +- .../kotlin/descriptors/impl/AbstractTypeAliasDescriptor.kt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java index 895c2be3b21..462d0dfef66 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java @@ -701,7 +701,7 @@ public class DescriptorResolver { } else { LexicalWritableScope writableScope = new LexicalWritableScope( - scope, containingDeclaration, false, null, new TraceBasedLocalRedeclarationChecker(trace), + scope, containingDeclaration, false, null, new TraceBasedLocalRedeclarationChecker(trace, overloadChecker), LexicalScopeKind.TYPE_ALIAS_HEADER); typeParameterDescriptors = resolveTypeParametersForDescriptor( typeAliasDescriptor, writableScope, scope, typeParameters, trace); diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/AbstractTypeAliasDescriptor.kt b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/AbstractTypeAliasDescriptor.kt index 6f788dfdba3..92cd83039c4 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/AbstractTypeAliasDescriptor.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/AbstractTypeAliasDescriptor.kt @@ -89,8 +89,8 @@ abstract class AbstractTypeAliasDescriptor( override fun getBuiltIns(): KotlinBuiltIns = declarationDescriptor.builtIns - override fun getAnnotations(): Annotations = - declarationDescriptor.annotations + override val annotations: Annotations + get() = declarationDescriptor.annotations } }