Fixed rendering parameter default value when it is string.

idea/src/org/jetbrains/jet/plugin/parameterInfo/JetFunctionParameterInfoHandler.java

@@ -28,7 +28,6 @@ import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.util.ArrayUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.plugin.codeInsight.TipsManager;
 import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.psi.*;
 import org.jetbrains.jet.lang.resolve.BindingContext;
@@ -39,6 +38,7 @@ import org.jetbrains.jet.lang.resolve.scopes.JetScope;
 import org.jetbrains.jet.lang.types.JetType;
 import org.jetbrains.jet.lang.types.checker.JetTypeChecker;
 import org.jetbrains.jet.lexer.JetTokens;
+import org.jetbrains.jet.plugin.codeInsight.TipsManager;
 import org.jetbrains.jet.plugin.project.AnalyzeSingleFileUtil;
 import org.jetbrains.jet.renderer.DescriptorRenderer;
 
@@ -144,38 +144,56 @@ public class JetFunctionParameterInfoHandler implements
         return true;
     }
     
-    private static String renderParameter(ValueParameterDescriptor descriptor, boolean named, BindingContext bindingContext) {
+    private static String renderParameter(ValueParameterDescriptor parameter, boolean named, BindingContext bindingContext) {
         StringBuilder builder = new StringBuilder();
         if (named) builder.append("[");
-        if (descriptor.getVarargElementType() != null) {
+        if (parameter.getVarargElementType() != null) {
             builder.append("vararg ");
         }
-        builder.append(descriptor.getName()).append(": ").
+        builder.append(parameter.getName()).append(": ").
-                append(DescriptorRenderer.SHORT_NAMES_IN_TYPES.renderType(getActualParameterType(descriptor)));
+                append(DescriptorRenderer.SHORT_NAMES_IN_TYPES.renderType(getActualParameterType(parameter)));
-        if (descriptor.hasDefaultValue()) {
+        if (parameter.hasDefaultValue()) {
-            PsiElement element = BindingContextUtils.descriptorToDeclaration(bindingContext, descriptor);
+            PsiElement parameterDeclaration = BindingContextUtils.descriptorToDeclaration(bindingContext, parameter);
-            String defaultExpression = "?";
+            builder.append(" = ").append(getDefaultExpressionString(parameterDeclaration));
-            if (element instanceof JetParameter) {
-                JetParameter parameter = (JetParameter) element;
-                JetExpression defaultValue = parameter.getDefaultValue();
-                if (defaultValue != null) {
-                    if (defaultValue instanceof JetConstantExpression) {
-                        JetConstantExpression constantExpression = (JetConstantExpression) defaultValue;
-                        defaultExpression = constantExpression.getText();
-                        if (defaultExpression.length() > 10) {
-                            if (defaultExpression.startsWith("\"")) defaultExpression = "\"...\"";
-                            else if (defaultExpression.startsWith("\'")) defaultExpression = "\'...\'";
-                            else defaultExpression = defaultExpression.substring(0, 7) + "...";
-                        }
-                    }
-                }
-            }
-            builder.append(" = ").append(defaultExpression);
         }
         if (named) builder.append("]");
         return builder.toString();
     }
 
+    private static String getDefaultExpressionString(@Nullable PsiElement parameterDeclaration) {
+        if (parameterDeclaration instanceof JetParameter) {
+            JetExpression defaultValue = ((JetParameter) parameterDeclaration).getDefaultValue();
+            if (defaultValue != null && isConstantExpression(defaultValue)) {
+                String defaultExpression = defaultValue.getText();
+                if (defaultExpression.length() > 10) {
+                    if (defaultExpression.startsWith("\"")) {
+                        return "\"...\"";
+                    }
+                    else if (defaultExpression.startsWith("\'")) {
+                        return "\'...\'";
+                    }
+                    else {
+                        return defaultExpression.substring(0, 7) + "...";
+                    }
+                }
+                return defaultExpression;
+            }
+        }
+        return "?";
+    }
+
+    private static boolean isConstantExpression(@NotNull JetExpression expression) {
+        if (expression instanceof JetStringTemplateExpression) {
+            for (JetStringTemplateEntry templateEntry : ((JetStringTemplateExpression) expression).getEntries()) {
+                if (templateEntry instanceof JetStringTemplateEntryWithExpression) {
+                    return false;
+                }
+            }
+            return true;
+        }
+        return expression instanceof JetConstantExpression;
+    }
+
     private static JetType getActualParameterType(ValueParameterDescriptor descriptor) {
         JetType paramType = descriptor.getType();
         if (descriptor.getVarargElementType() != null) paramType = descriptor.getVarargElementType();

idea/testData/parameterInfo/functionParameterInfo/NamedAndDefaultParameter.kt

@@ -1,6 +1,6 @@
 open class A(x: Int) {
     fun m(x: Int) = 1
-    fun m(x: Int, y: Boolean = true, z: Long = 12345678901234) = 2
+    fun m(x: Int, y: Boolean = true, z: Long = 12345678901234, u: String = "abc\n", u0: String = "", uu: String = "$u", v: Char = '\u0000') = 2
 
     fun d(x: Int) {
         m(<caret>y = false, x = 1)
@@ -8,5 +8,5 @@ open class A(x: Int) {
 }
 /*
 Text: ([x: Int]), Disabled: false, Strikeout: false, Green: false
-Text: ([y: Boolean = true], [x: Int], [z: Long = 1234567...]), Disabled: false, Strikeout: false, Green: true
+Text: ([y: Boolean = true], [x: Int], [z: Long = 1234567...], [u: String = "abc\n"], [u0: String = ""], [uu: String = ?], [v: Char = '\u0000']), Disabled: false, Strikeout: false, Green: true
 */