azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

In-place Introduce: Track active instance of KotlinInplaceVariableIntroducer

Browse Source
This commit is contained in:
Alexey Sedunov
2015-04-08 14:23:20 +03:00
parent 68a5b05af9
commit f038a2d1d8
1 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinInplaceVariableIntroducer.java
+23 -4
View File
@@ -27,10 +27,7 @@ import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.editor.markup.RangeHighlighter; import com.intellij.openapi.editor.markup.RangeHighlighter;
import com.intellij.openapi.project.Project; import com.intellij.openapi.project.Project;
import com.intellij.openapi.ui.popup.Balloon; import com.intellij.openapi.ui.popup.Balloon;
import com.intellij.openapi.util.Pair; import com.intellij.openapi.util.*;
import com.intellij.openapi.util.Pass;
import com.intellij.openapi.util.Ref;
import com.intellij.openapi.util.TextRange;
import com.intellij.psi.*; import com.intellij.psi.*;
import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil;
import com.intellij.psi.search.SearchScope; import com.intellij.psi.search.SearchScope;
@@ -58,6 +55,8 @@ import java.util.LinkedHashSet;
import java.util.List; import java.util.List;
public class KotlinInplaceVariableIntroducer<D extends JetCallableDeclaration> extends InplaceVariableIntroducer<JetExpression> { public class KotlinInplaceVariableIntroducer<D extends JetCallableDeclaration> extends InplaceVariableIntroducer<JetExpression> {
private static final Key<KotlinInplaceVariableIntroducer> ACTIVE_INTRODUCER = Key.create("ACTIVE_INTRODUCER");
public static final String TYPE_REFERENCE_VARIABLE_NAME = "TypeReferenceVariable"; public static final String TYPE_REFERENCE_VARIABLE_NAME = "TypeReferenceVariable";
public static final String PRIMARY_VARIABLE_NAME = "PrimaryVariable"; public static final String PRIMARY_VARIABLE_NAME = "PrimaryVariable";
@@ -390,6 +389,21 @@ public class KotlinInplaceVariableIntroducer<D extends JetCallableDeclaration> e
); );
} }
@Override
public boolean performInplaceRefactoring(LinkedHashSet<String> nameSuggestions) {
if (super.performInplaceRefactoring(nameSuggestions)) {
myEditor.putUserData(ACTIVE_INTRODUCER, this);
return true;
}
return false;
}
@Override
public void finish(boolean success) {
super.finish(success);
myEditor.putUserData(ACTIVE_INTRODUCER, null);
}
@Override @Override
protected void moveOffsetAfter(boolean success) { protected void moveOffsetAfter(boolean success) {
if (!myReplaceOccurrence || myExprMarker == null) { if (!myReplaceOccurrence || myExprMarker == null) {
@@ -407,4 +421,9 @@ public class KotlinInplaceVariableIntroducer<D extends JetCallableDeclaration> e
} }
} }
} }
@Nullable
public static KotlinInplaceVariableIntroducer getActiveInstance(@NotNull Editor editor) {
return editor.getUserData(ACTIVE_INTRODUCER);
}
} }