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

Modified doRefactoring to allow occurrences to be specified

Browse Source
This commit is contained in:
Zack Grannan
2014-03-02 17:34:28 -08:00
committed by Zalim Bashorov
parent aa00862425
commit fcbd7b357a
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/refactoring/introduceVariable/JetIntroduceVariableHandler.java
+16 -4
View File
@@ -65,7 +65,7 @@ public class JetIntroduceVariableHandler extends JetIntroduceHandlerBase {
JetRefactoringUtil.SelectExpressionCallback callback = new JetRefactoringUtil.SelectExpressionCallback() { JetRefactoringUtil.SelectExpressionCallback callback = new JetRefactoringUtil.SelectExpressionCallback() {
@Override @Override
public void run(@Nullable JetExpression expression) { public void run(@Nullable JetExpression expression) {
doRefactoring(project, editor, expression); doRefactoring(project, editor, expression, null);
} }
}; };
try { try {
@@ -76,7 +76,11 @@ public class JetIntroduceVariableHandler extends JetIntroduceHandlerBase {
} }
} }
private static void doRefactoring(@NotNull final Project project, final Editor editor, @Nullable JetExpression _expression) {
public static void doRefactoring(
@NotNull final Project project, final Editor editor, @Nullable JetExpression _expression,
@Nullable List<JetExpression> occurrencesToReplace
) {
if (_expression == null) { if (_expression == null) {
showErrorHint(project, editor, JetRefactoringBundle.message("cannot.refactor.no.expression")); showErrorHint(project, editor, JetRefactoringBundle.message("cannot.refactor.no.expression"));
return; return;
@@ -155,7 +159,15 @@ public class JetIntroduceVariableHandler extends JetIntroduceHandlerBase {
final boolean isInplaceAvailableOnDataContext = final boolean isInplaceAvailableOnDataContext =
editor.getSettings().isVariableInplaceRenameEnabled() && editor.getSettings().isVariableInplaceRenameEnabled() &&
!ApplicationManager.getApplication().isUnitTestMode(); !ApplicationManager.getApplication().isUnitTestMode();
final List<JetExpression> allOccurrences = findOccurrences(occurrenceContainer, expression);
final List<JetExpression> allOccurrences;
if (occurrencesToReplace == null) {
allOccurrences = findOccurrences(occurrenceContainer, expression);
}
else {
allOccurrences = occurrencesToReplace;
}
final boolean finalNoTypeInference = noTypeInference; final boolean finalNoTypeInference = noTypeInference;
final boolean finalNeedParentheses = needParentheses; final boolean finalNeedParentheses = needParentheses;
Pass<OccurrencesChooser.ReplaceChoice> callback = new Pass<OccurrencesChooser.ReplaceChoice>() { Pass<OccurrencesChooser.ReplaceChoice> callback = new Pass<OccurrencesChooser.ReplaceChoice>() {
@@ -212,7 +224,7 @@ public class JetIntroduceVariableHandler extends JetIntroduceHandlerBase {
}, INTRODUCE_VARIABLE, null); }, INTRODUCE_VARIABLE, null);
} }
}; };
if (isInplaceAvailableOnDataContext) { if (isInplaceAvailableOnDataContext && occurrencesToReplace == null) {
OccurrencesChooser.<JetExpression>simpleChooser(editor). OccurrencesChooser.<JetExpression>simpleChooser(editor).
showChooser(expression, allOccurrences, callback); showChooser(expression, allOccurrences, callback);
} }