From 858a95e9bd4105d073ca6d9a37a9ab6f6b8b7875 Mon Sep 17 00:00:00 2001
From: anna <Anna.Kozlova@jetbrains.com>
Date: Tue, 24 Jul 2012 14:06:06 +0200
Subject: [PATCH] inplace introduce: do not select the typed name on template
 restart (IDEA-69477)

---
 .../replaceAllWithClassRefType_after.java     |  8 +++----
 .../beforeAssignmentReplaceAll_after.java     |  2 +-
 .../replaceAllMethodCalls_after.java          |  4 ++--
 .../inplace/AbstractInplaceIntroducer.java    | 21 ++++++++++++++++++-
 .../rename/inplace/InplaceRefactoring.java    |  4 +++-
 5 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/java/java-tests/testData/refactoring/inplaceIntroduceConstant/replaceAllWithClassRefType_after.java b/java/java-tests/testData/refactoring/inplaceIntroduceConstant/replaceAllWithClassRefType_after.java
index 9dc08ab38e06..4ffba021a591 100644
--- a/java/java-tests/testData/refactoring/inplaceIntroduceConstant/replaceAllWithClassRefType_after.java
+++ b/java/java-tests/testData/refactoring/inplaceIntroduceConstant/replaceAllWithClassRefType_after.java
@@ -1,12 +1,12 @@
 public class Derr {
 
-    public static final Long ONE = new Long(1);
+    public static final Long LONGONE = new Long(1);
 
     public static void main(String[] args) {
         long value;
 
-        value = ONE;
-        value = ONE;
-        value = ONE;
+        value = LONGONE;
+        value = LONGONE;
+        value = LONGONE;
     }
 }
\ No newline at end of file
diff --git a/java/java-tests/testData/refactoring/inplaceIntroduceField/beforeAssignmentReplaceAll_after.java b/java/java-tests/testData/refactoring/inplaceIntroduceField/beforeAssignmentReplaceAll_after.java
index 79053152e42b..3e61dd57c8de 100644
--- a/java/java-tests/testData/refactoring/inplaceIntroduceField/beforeAssignmentReplaceAll_after.java
+++ b/java/java-tests/testData/refactoring/inplaceIntroduceField/beforeAssignmentReplaceAll_after.java
@@ -3,7 +3,7 @@ class Test {
     private final String string;
 
     Test() {
-        <caret>string = "";
+        string = "";<caret>
         myTimer = string;
   }
 }
\ No newline at end of file
diff --git a/java/java-tests/testData/refactoring/inplaceIntroduceParameter/replaceAllMethodCalls_after.java b/java/java-tests/testData/refactoring/inplaceIntroduceParameter/replaceAllMethodCalls_after.java
index 04616eb6e31f..6853ca829b2f 100644
--- a/java/java-tests/testData/refactoring/inplaceIntroduceParameter/replaceAllMethodCalls_after.java
+++ b/java/java-tests/testData/refactoring/inplaceIntroduceParameter/replaceAllMethodCalls_after.java
@@ -1,6 +1,6 @@
 public class Aaa {
-  public String method(String string) {
-    return string + string + string;
+  public String method(String stringstring) {
+    return stringstring + stringstring + stringstring;
   }
 
   public String getString() {
diff --git a/platform/lang-impl/src/com/intellij/refactoring/introduce/inplace/AbstractInplaceIntroducer.java b/platform/lang-impl/src/com/intellij/refactoring/introduce/inplace/AbstractInplaceIntroducer.java
index 625568fb8c20..e33cae73d485 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/introduce/inplace/AbstractInplaceIntroducer.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/introduce/inplace/AbstractInplaceIntroducer.java
@@ -297,6 +297,12 @@ public abstract class AbstractInplaceIntroducer<V extends PsiNameIdentifierOwner
     }
   }
 
+  private boolean myShouldSelect = true;
+  @Override
+  protected boolean shouldSelectAll() {
+    return myShouldSelect;
+  }
+
   public void restartInplaceIntroduceTemplate() {
     Runnable restartTemplateRunnable = new Runnable() {
       public void run() {
@@ -305,7 +311,13 @@ public abstract class AbstractInplaceIntroducer<V extends PsiNameIdentifierOwner
           myEditor.putUserData(INTRODUCE_RESTART, true);
           try {
             templateState.gotoEnd(true);
-            startInplaceIntroduceTemplate();
+            try {
+              myShouldSelect = false;
+              startInplaceIntroduceTemplate();
+            }
+            finally {
+              myShouldSelect = true;
+            }
           }
           finally {
             myEditor.putUserData(INTRODUCE_RESTART, false);
@@ -317,6 +329,13 @@ public abstract class AbstractInplaceIntroducer<V extends PsiNameIdentifierOwner
     CommandProcessor.getInstance().executeCommand(myProject, restartTemplateRunnable, getCommandName(), getCommandName());
   }
 
+  @Override
+  protected void restoreSelection() {
+    if (!shouldSelectAll()) {
+      myEditor.getSelectionModel().removeSelection();
+    }
+  }
+ 
   public String getInputName() {
     return myInsertedName;
   }
diff --git a/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/InplaceRefactoring.java b/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/InplaceRefactoring.java
index 233d8a417664..131dc41254db 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/InplaceRefactoring.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/InplaceRefactoring.java
@@ -308,6 +308,8 @@ public abstract class InplaceRefactoring {
   protected void beforeTemplateStart() {
     myCaretRangeMarker = myEditor.getDocument()
           .createRangeMarker(new TextRange(myEditor.getCaretModel().getOffset(), myEditor.getCaretModel().getOffset()));
+    myCaretRangeMarker.setGreedyToLeft(true);
+    myCaretRangeMarker.setGreedyToRight(true);
   }
 
   private void startTemplate(final TemplateBuilderImpl builder) {
@@ -396,7 +398,7 @@ public abstract class InplaceRefactoring {
   }
 
   protected int restoreCaretOffset(int offset) {
-    return myCaretRangeMarker.isValid() ? myCaretRangeMarker.getStartOffset() : offset;
+    return myCaretRangeMarker.isValid() ? myCaretRangeMarker.getEndOffset() : offset;
   }
 
   protected void navigateToAlreadyStarted(Document oldDocument, int exitCode) {