From 5b4bf7036d1303e5d0a0fde0776d8dda56e9f787 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Tue, 9 Oct 2012 19:18:37 +0400 Subject: [PATCH] Default value string for field annotation --- .../ktSignature/AddKotlinSignatureAnnotation.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/ktSignature/AddKotlinSignatureAnnotation.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/ktSignature/AddKotlinSignatureAnnotation.java index 644bcab4e1c..39eaf17f812 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/ktSignature/AddKotlinSignatureAnnotation.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/ktSignature/AddKotlinSignatureAnnotation.java @@ -34,10 +34,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.di.InjectorForJavaSemanticServices; import org.jetbrains.jet.lang.BuiltinsScopeExtensionMode; -import org.jetbrains.jet.lang.descriptors.ClassDescriptor; -import org.jetbrains.jet.lang.descriptors.ConstructorDescriptor; -import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor; -import org.jetbrains.jet.lang.descriptors.SimpleFunctionDescriptor; +import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver; import org.jetbrains.jet.lang.resolve.name.FqName; @@ -158,9 +155,11 @@ public class AddKotlinSignatureAnnotation extends BaseIntentionAction implements @NotNull private static String getDefaultSignature(@NotNull PsiField field, FqName classFqName, JavaDescriptorResolver javaDescriptorResolver, BindingContext context) { - // getMemberScope(field, classFqName, javaDescriptorResolver).getProperties(Name.identifier(field.getName())); - // TODO: Generate default string for the field - return ""; + getMemberScope(field, classFqName, javaDescriptorResolver).getProperties(Name.identifier(field.getName())); + + VariableDescriptor variableDescriptor = context.get(BindingContext.VARIABLE, field); + assert variableDescriptor != null: "Couldn't find variable descriptor for field " + field.getName() + " in " + classFqName; + return RENDERER.render(variableDescriptor); } @NotNull