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

Separate GUI logic from smartSelectExpression

Browse Source 
Previously smartSelectExpression did both the determination of suitable
expressions and displaying the GUI. Separate the actual logic into a new
method, getSmartSelectSuggestions so that smart selection can be tested
in the future.
This commit is contained in:
Tuomas Tynkkynen
2014-02-07 13:26:12 -08:00
committed by Nikolay Krasko
parent 7429cc8819
commit 815ca2fe57
1 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/refactoring/JetRefactoringUtil.java
+22 -9
View File
@@ -383,16 +383,22 @@ public class JetRefactoringUtil {
}
}
private static void smartSelectExpression(@NotNull Editor editor, @NotNull PsiFile file, int offset,
@NotNull final SelectExpressionCallback callback)
throws IntroduceRefactoringException {
if (offset < 0) throw new IntroduceRefactoringException(JetRefactoringBundle.message("cannot.refactor.not.expression"));
PsiElement element = file.findElementAt(offset);
if (element == null) throw new IntroduceRefactoringException(JetRefactoringBundle.message("cannot.refactor.not.expression"));
if (element instanceof PsiWhiteSpace) {
smartSelectExpression(editor, file, offset - 1, callback);
return;
public static List<JetExpression> getSmartSelectSuggestions(
@NotNull PsiFile file,
int offset
) throws IntroduceRefactoringException {
if (offset < 0) {
return new ArrayList<JetExpression>();
}
PsiElement element = file.findElementAt(offset);
if (element == null) {
return new ArrayList<JetExpression>();
}
if (element instanceof PsiWhiteSpace) {
return getSmartSelectSuggestions(file, offset - 1);
}
ArrayList<JetExpression> expressions = new ArrayList<JetExpression>();
while (element != null && !(element instanceof JetBlockExpression && !(element.getParent() instanceof JetFunctionLiteral)) &&
!(element instanceof JetNamedFunction)
@@ -427,6 +433,13 @@ public class JetRefactoringUtil {
}
element = element.getParent();
}
return expressions;
}
private static void smartSelectExpression(
@NotNull Editor editor, @NotNull PsiFile file, int offset,
@NotNull final SelectExpressionCallback callback) throws IntroduceRefactoringException {
List<JetExpression> expressions = getSmartSelectSuggestions(file, offset);
if (expressions.size() == 0) throw new IntroduceRefactoringException(JetRefactoringBundle.message("cannot.refactor.not.expression"));
if (expressions.size() == 1) {