From 0e4b59cc282b208bbdee2e2bd069ab45da4c23e8 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Tue, 21 Aug 2012 15:26:54 +0400 Subject: [PATCH] Simplify code in DescriptorResolver#resolvePrimaryConstructorParameterToAProperty. --- .../org/jetbrains/jet/lang/resolve/DescriptorResolver.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java index 441d4d1c395..e9cd1883596 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java @@ -1070,7 +1070,7 @@ public class DescriptorResolver { @NotNull JetParameter parameter, BindingTrace trace ) { JetType type = resolveParameterType(scope, parameter, trace); - Name name = parameter.getNameAsName(); + Name name = parameter.getNameAsSafeName(); boolean isMutable = parameter.isMutable(); JetModifierList modifierList = parameter.getModifierList(); @@ -1088,7 +1088,7 @@ public class DescriptorResolver { resolveVisibilityFromModifiers(parameter.getModifierList()), isMutable, false, - name == null ? Name.special("") : name, + name, CallableMemberDescriptor.Kind.DECLARATION ); propertyDescriptor.setType(type, Collections.emptyList(),