From 94f4ddb76268c719b6089e3437138cf79eefdbf4 Mon Sep 17 00:00:00 2001
From: Andrey Breslav <andrey.breslav@jetbrains.com>
Date: Tue, 7 Oct 2014 20:02:51 +0400
Subject: [PATCH] IDE TypeUtils moved to idea-analysis

---
 .../src/org/jetbrains/jet/plugin/util/TypeUtils.kt            | 0
 .../jetbrains/jet/plugin/refactoring/JetRefactoringUtil.java  | 3 ++-
 .../jetbrains/jet/plugin/refactoring/jetRefactoringUtil.kt    | 4 +---
 idea/src/org/jetbrains/jet/plugin/util/stringUtil.kt          | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)
 rename idea/{ => idea-analysis}/src/org/jetbrains/jet/plugin/util/TypeUtils.kt (100%)

diff --git a/idea/src/org/jetbrains/jet/plugin/util/TypeUtils.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/util/TypeUtils.kt
similarity index 100%
rename from idea/src/org/jetbrains/jet/plugin/util/TypeUtils.kt
rename to idea/idea-analysis/src/org/jetbrains/jet/plugin/util/TypeUtils.kt
diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/JetRefactoringUtil.java b/idea/src/org/jetbrains/jet/plugin/refactoring/JetRefactoringUtil.java
index 0a663705350..5e04a0dd33c 100644
--- a/idea/src/org/jetbrains/jet/plugin/refactoring/JetRefactoringUtil.java
+++ b/idea/src/org/jetbrains/jet/plugin/refactoring/JetRefactoringUtil.java
@@ -56,6 +56,7 @@ import org.jetbrains.jet.plugin.codeInsight.DescriptorToDeclarationUtil;
 import org.jetbrains.jet.plugin.project.AnalyzerFacadeWithCache;
 import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers;
 import org.jetbrains.jet.plugin.util.UtilPackage;
+import org.jetbrains.jet.plugin.util.string.StringPackage;
 import org.jetbrains.jet.renderer.DescriptorRenderer;
 
 import javax.swing.*;
@@ -503,7 +504,7 @@ public class JetRefactoringUtil {
     }
 
     public static String getExpressionShortText(@NotNull JetElement element) { //todo: write appropriate implementation
-        return UtilPackage.collapseSpaces(StringUtil.shortenTextWithEllipsis(element.getText(), 53, 0));
+        return StringPackage.collapseSpaces(StringUtil.shortenTextWithEllipsis(element.getText(), 53, 0));
     }
 
     @Nullable
diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/jetRefactoringUtil.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/jetRefactoringUtil.kt
index 2758ae95384..f70ffa1dd57 100644
--- a/idea/src/org/jetbrains/jet/plugin/refactoring/jetRefactoringUtil.kt
+++ b/idea/src/org/jetbrains/jet/plugin/refactoring/jetRefactoringUtil.kt
@@ -44,7 +44,6 @@ import com.intellij.openapi.application.ApplicationManager
 import com.intellij.refactoring.BaseRefactoringProcessor.ConflictsInTestsException
 import com.intellij.refactoring.ui.ConflictsDialog
 import com.intellij.util.containers.MultiMap
-import com.intellij.openapi.command.CommandProcessor
 import org.jetbrains.jet.lang.psi.codeFragmentUtil.skipVisibilityCheck
 import com.intellij.ide.util.PsiElementListCellRenderer
 import com.intellij.openapi.ui.popup.JBPopup
@@ -67,14 +66,13 @@ import org.jetbrains.jet.lang.resolve.BindingContext
 import org.jetbrains.jet.lang.psi.psiUtil.getParentByType
 import org.jetbrains.jet.lang.psi.psiUtil.isAncestor
 import org.jetbrains.jet.plugin.caches.resolve.getLazyResolveSession
-import org.jetbrains.jet.plugin.util.application.runWriteAction
 import com.intellij.psi.PsiNamedElement
 import org.jetbrains.jet.plugin.project.AnalyzerFacadeWithCache
 import org.jetbrains.jet.lang.descriptors.FunctionDescriptor
 import org.jetbrains.jet.renderer.DescriptorRenderer
 import com.intellij.openapi.util.text.StringUtil
-import org.jetbrains.jet.plugin.util.collapseSpaces
 import javax.swing.Icon
+import org.jetbrains.jet.plugin.util.string.collapseSpaces
 
 /**
  * Replace [[JetSimpleNameExpression]] (and its enclosing qualifier) with qualified element given by FqName
diff --git a/idea/src/org/jetbrains/jet/plugin/util/stringUtil.kt b/idea/src/org/jetbrains/jet/plugin/util/stringUtil.kt
index ed0121ad110..7cc5e4f1d74 100644
--- a/idea/src/org/jetbrains/jet/plugin/util/stringUtil.kt
+++ b/idea/src/org/jetbrains/jet/plugin/util/stringUtil.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.plugin.util
+package org.jetbrains.jet.plugin.util.string
 
 fun String.collapseSpaces(): String {
     val builder = StringBuilder()