From 61221382b561664e89776c48f724996375d90378 Mon Sep 17 00:00:00 2001
From: Valentin Kipyatkov <valentin@jetbrains.com>
Date: Mon, 6 Oct 2014 21:52:54 +0400
Subject: [PATCH] Inlined
 CodeInsightUtils.createFunctionSignatureStringFromDescriptor()

---
 .../actions/JetAddFunctionToClassifierAction.java     | 10 +++-------
 .../jet/plugin/codeInsight/CodeInsightUtils.java      | 11 -----------
 .../plugin/quickfix/AddFunctionToSupertypeFix.java    |  4 ++--
 3 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/idea/src/org/jetbrains/jet/plugin/actions/JetAddFunctionToClassifierAction.java b/idea/src/org/jetbrains/jet/plugin/actions/JetAddFunctionToClassifierAction.java
index 8bf6a14bd32..499c49037e1 100644
--- a/idea/src/org/jetbrains/jet/plugin/actions/JetAddFunctionToClassifierAction.java
+++ b/idea/src/org/jetbrains/jet/plugin/actions/JetAddFunctionToClassifierAction.java
@@ -40,9 +40,9 @@ import org.jetbrains.jet.lang.psi.JetPsiFactory;
 import org.jetbrains.jet.lang.types.JetType;
 import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
 import org.jetbrains.jet.plugin.JetBundle;
-import org.jetbrains.jet.plugin.codeInsight.CodeInsightUtils;
 import org.jetbrains.jet.plugin.codeInsight.DescriptorToDeclarationUtil;
 import org.jetbrains.jet.plugin.codeInsight.ShortenReferences;
+import org.jetbrains.jet.renderer.DescriptorRenderer;
 
 import javax.swing.*;
 import java.util.ArrayList;
@@ -74,9 +74,7 @@ public class JetAddFunctionToClassifierAction implements QuestionAction {
             @NotNull final ClassDescriptor typeDescriptor,
             @NotNull final FunctionDescriptor functionDescriptor
     ) {
-        final String signatureString = CodeInsightUtils.createFunctionSignatureStringFromDescriptor(
-                functionDescriptor,
-                /* shortTypeNames = */ false);
+        final String signatureString = DescriptorRenderer.SOURCE_CODE.render(functionDescriptor);
 
         PsiDocumentManager.getInstance(project).commitAllDocuments();
 
@@ -160,9 +158,7 @@ public class JetAddFunctionToClassifierAction implements QuestionAction {
             public String getTextFor(FunctionDescriptor functionDescriptor) {
                 ClassDescriptor type = (ClassDescriptor) functionDescriptor.getContainingDeclaration();
                 return JetBundle.message("add.function.to.type.action.single",
-                                         CodeInsightUtils.createFunctionSignatureStringFromDescriptor(
-                                                 functionDescriptor,
-                                                 /* shortTypeNames = */ true),
+                                         DescriptorRenderer.SOURCE_CODE_SHORT_NAMES_IN_TYPES.render(functionDescriptor),
                                          type.getName().toString());
             }
         };
diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/CodeInsightUtils.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/CodeInsightUtils.java
index 97a52105db3..6424612dbb3 100644
--- a/idea/src/org/jetbrains/jet/plugin/codeInsight/CodeInsightUtils.java
+++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/CodeInsightUtils.java
@@ -27,11 +27,9 @@ import com.intellij.refactoring.util.CommonRefactoringUtil;
 import com.intellij.util.text.CharArrayUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.lang.descriptors.FunctionDescriptor;
 import org.jetbrains.jet.lang.psi.*;
 import org.jetbrains.jet.lang.types.JetType;
 import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
-import org.jetbrains.jet.renderer.DescriptorRenderer;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -221,15 +219,6 @@ public class CodeInsightUtils {
     private CodeInsightUtils() {
     }
 
-    @NotNull
-    public static String createFunctionSignatureStringFromDescriptor(
-            @NotNull FunctionDescriptor descriptor,
-            boolean shortTypeNames
-    ) {
-        DescriptorRenderer renderer = shortTypeNames ? DescriptorRenderer.SOURCE_CODE_SHORT_NAMES_IN_TYPES : DescriptorRenderer.SOURCE_CODE;
-        return renderer.render(descriptor);
-    }
-
     @Nullable
     public static Integer getStartLineOffset(@NotNull PsiFile file, int line) {
         Document document = PsiDocumentManager.getInstance(file.getProject()).getDocument(file);
diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/AddFunctionToSupertypeFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/AddFunctionToSupertypeFix.java
index d49fe7dac15..575860e5a35 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/AddFunctionToSupertypeFix.java
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/AddFunctionToSupertypeFix.java
@@ -36,7 +36,7 @@ import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
 import org.jetbrains.jet.plugin.JetBundle;
 import org.jetbrains.jet.plugin.actions.JetAddFunctionToClassifierAction;
 import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
-import org.jetbrains.jet.plugin.codeInsight.CodeInsightUtils;
+import org.jetbrains.jet.renderer.DescriptorRenderer;
 
 import java.util.Collections;
 import java.util.Comparator;
@@ -125,7 +125,7 @@ public class AddFunctionToSupertypeFix extends JetHintAction<JetNamedFunction> {
             FunctionDescriptor newFunction = functionsToAdd.get(0);
             ClassDescriptor supertype = (ClassDescriptor) newFunction.getContainingDeclaration();
             return JetBundle.message("add.function.to.type.action.single",
-                                     CodeInsightUtils.createFunctionSignatureStringFromDescriptor(newFunction, /* shortTypeNames */ true),
+                                     DescriptorRenderer.SOURCE_CODE_SHORT_NAMES_IN_TYPES.render(newFunction),
                                      supertype.getName().toString());
         }
         else {