From 3fb7ff90e61b36395e1fe07ccd1573d5d3be71b8 Mon Sep 17 00:00:00 2001
From: Alexander Kirillin <angus@jetbrains.com>
Date: Tue, 20 Dec 2011 15:46:46 +0300
Subject: [PATCH] Tests for introduce in objc

---
 .../inplace/AbstractInplaceIntroducer.java          | 13 +++++++++----
 .../inplace/InplaceVariableIntroducer.java          |  8 ++++++--
 2 files changed, 15 insertions(+), 6 deletions(-)

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 ab4f8908dcc3..bacc45bce128 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
@@ -92,13 +92,13 @@ public abstract class AbstractInplaceIntroducer<V extends PsiNameIdentifierOwner
     if (localVariable != null) {
       final PsiElement nameIdentifier = localVariable.getNameIdentifier();
       if (nameIdentifier != null) {
-        myLocalMarker = editor.getDocument().createRangeMarker(nameIdentifier.getTextRange());
+        myLocalMarker = createMarker(nameIdentifier);
       }
     }
     else {
       myLocalMarker = null;
     }
-    myExprText = expr != null ? expr.getText() : null;
+    myExprText = getExpressionText(expr);
     myLocalName = localVariable != null ? localVariable.getName() : null;
 
     myPreview =
@@ -132,6 +132,11 @@ public abstract class AbstractInplaceIntroducer<V extends PsiNameIdentifierOwner
     showDialogAdvertisement(getActionName());
   }
 
+  @Nullable
+  protected String getExpressionText(E expr) {
+    return expr != null ? expr.getText() : null;
+  }
+
   protected final void setPreviewText(final String text) {
     if (myPreview == null) return; //already disposed
     ApplicationManager.getApplication().runWriteAction(new Runnable() {
@@ -433,7 +438,7 @@ public abstract class AbstractInplaceIntroducer<V extends PsiNameIdentifierOwner
         if (exprMarker != null) {
           myExpr = restoreExpression(containingFile, psiField, exprMarker, myExprText);
           if (myExpr != null && myExpr.isPhysical()) {
-            myExprMarker = myEditor.getDocument().createRangeMarker(myExpr.getTextRange());
+            myExprMarker = createMarker(myExpr);
           }
         }
         if (myLocalMarker != null) {
@@ -449,7 +454,7 @@ public abstract class AbstractInplaceIntroducer<V extends PsiNameIdentifierOwner
           if (localVariable != null && localVariable.isPhysical()) {
             final PsiElement nameIdentifier = localVariable.getNameIdentifier();
             if (nameIdentifier != null) {
-              myLocalMarker = myEditor.getDocument().createRangeMarker(nameIdentifier.getTextRange());
+              myLocalMarker = createMarker(nameIdentifier);
             }
           }
         }
diff --git a/platform/lang-impl/src/com/intellij/refactoring/introduce/inplace/InplaceVariableIntroducer.java b/platform/lang-impl/src/com/intellij/refactoring/introduce/inplace/InplaceVariableIntroducer.java
index 04f188809dfc..92df2b890fc6 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/introduce/inplace/InplaceVariableIntroducer.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/introduce/inplace/InplaceVariableIntroducer.java
@@ -76,7 +76,7 @@ public class InplaceVariableIntroducer<E extends PsiElement> extends VariableInp
     myTitle = title;
     myOccurrences = occurrences;
     myExpr = expr;
-    myExprMarker = myExpr != null && myExpr.isPhysical() ? myEditor.getDocument().createRangeMarker(myExpr.getTextRange()) : null;
+    myExprMarker = myExpr != null && myExpr.isPhysical() ? createMarker(myExpr) : null;
     initOccurrencesMarkers();
   }
 
@@ -127,10 +127,14 @@ public class InplaceVariableIntroducer<E extends PsiElement> extends VariableInp
     if (myOccurrenceMarkers != null) return;
     myOccurrenceMarkers = new ArrayList<RangeMarker>();
     for (E occurrence : myOccurrences) {
-      myOccurrenceMarkers.add(myEditor.getDocument().createRangeMarker(occurrence.getTextRange()));
+      myOccurrenceMarkers.add(createMarker(occurrence));
     }
   }
 
+  protected RangeMarker createMarker(PsiElement element) {
+    return myEditor.getDocument().createRangeMarker(element.getTextRange());
+  }
+
 
   public RangeMarker getExprMarker() {
     return myExprMarker;