From 3710d4105c7bbc7ff5723850b978debc8a03e4bb Mon Sep 17 00:00:00 2001
From: Valentin Kipyatkov <valentin@jetbrains.com>
Date: Thu, 12 Feb 2015 00:30:55 +0300
Subject: [PATCH] Do not shorten too much

---
 .../kotlin/idea/references/JetSimpleNameReference.kt        | 6 ++----
 .../movePackageToAnotherPackage/after/c/noImports.kt        | 4 ++--
 .../kotlin/movePackage/movePackage/after/c/noImports.kt     | 3 +--
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/JetSimpleNameReference.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/JetSimpleNameReference.kt
index ea665a477f8..fb5361d87d8 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/JetSimpleNameReference.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/JetSimpleNameReference.kt
@@ -24,8 +24,6 @@ import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.lexer.JetTokens
 import org.jetbrains.kotlin.idea.util.ShortenReferences
 import org.jetbrains.kotlin.idea.refactoring.fqName.changeQualifiedName
-import org.jetbrains.kotlin.psi.psiUtil.getQualifiedElementSelector
-import org.jetbrains.kotlin.psi.psiUtil.getOutermostNonInterleavingQualifiedElement
 import org.jetbrains.kotlin.idea.codeInsight.shorten.addToShorteningWaitSet
 import org.jetbrains.kotlin.idea.refactoring.fqName.getKotlinFqName
 import org.jetbrains.kotlin.types.expressions.OperatorConventions
@@ -36,7 +34,7 @@ import com.intellij.util.IncorrectOperationException
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.resolve.dataClassUtils.isComponentLike
 import org.jetbrains.kotlin.idea.caches.resolve.analyze
-import org.jetbrains.kotlin.psi.psiUtil.getParentOfTypeAndBranch
+import org.jetbrains.kotlin.psi.psiUtil.*
 
 public class JetSimpleNameReference(
         jetSimpleNameExpression: JetSimpleNameExpression
@@ -115,7 +113,7 @@ public class JetSimpleNameReference(
         if (fqName.isRoot()) return expression
 
         val newExpression = expression.changeQualifiedName(fqName).getQualifiedElementSelector() as JetSimpleNameExpression
-        val newQualifiedElement = newExpression.getOutermostNonInterleavingQualifiedElement()
+        val newQualifiedElement = newExpression.getQualifiedElement()
 
         if (shorteningMode == ShorteningMode.NO_SHORTENING) return newExpression
 
diff --git a/idea/testData/refactoring/move/java/movePackage/movePackageToAnotherPackage/after/c/noImports.kt b/idea/testData/refactoring/move/java/movePackage/movePackageToAnotherPackage/after/c/noImports.kt
index ffb4594cf64..08f88cf630d 100644
--- a/idea/testData/refactoring/move/java/movePackage/movePackageToAnotherPackage/after/c/noImports.kt
+++ b/idea/testData/refactoring/move/java/movePackage/movePackageToAnotherPackage/after/c/noImports.kt
@@ -1,5 +1,5 @@
-import b.a.A
+import b.a
 
 fun bar() {
-    val t: A = A()
+    val t: a.A = a.A()
 }
diff --git a/idea/testData/refactoring/move/kotlin/movePackage/movePackage/after/c/noImports.kt b/idea/testData/refactoring/move/kotlin/movePackage/movePackage/after/c/noImports.kt
index 55fba761ff9..ab9987296a5 100644
--- a/idea/testData/refactoring/move/kotlin/movePackage/movePackage/after/c/noImports.kt
+++ b/idea/testData/refactoring/move/kotlin/movePackage/movePackage/after/c/noImports.kt
@@ -1,10 +1,9 @@
 package c
 
-import b.a.A
 import b.a
 
 fun bar() {
-    val t: A = A()
+    val t: a.A = a.A()
     a.foo()
     println(a.x)
     a.x = ""