MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-141973 Java else if: missing select word step

Browse Source
This commit is contained in:
peter
2015-07-02 17:54:22 +02:00
parent f25a9a7ebe
commit d4620677e5
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/editorActions/wordSelection/IfStatementSelectioner.java
+15 -4
View File
@@ -40,6 +40,14 @@ public class IfStatementSelectioner extends BasicSelectioner {
final PsiKeyword elseKeyword = statement.getElseElement();
if (elseKeyword != null) {
final PsiStatement then = statement.getThenBranch();
if (then != null) {
final TextRange thenRange = new TextRange(statement.getTextRange().getStartOffset(), then.getTextRange().getEndOffset());
if (thenRange.contains(cursorOffset)) {
result.addAll(expandToWholeLine(editorText, thenRange, false));
}
}
result.addAll(expandToWholeLine(editorText,
new TextRange(elseKeyword.getTextRange().getStartOffset(),
statement.getTextRange().getEndOffset()),
@@ -50,10 +58,13 @@ public class IfStatementSelectioner extends BasicSelectioner {
PsiIfStatement elseIf = (PsiIfStatement)branch;
final PsiKeyword element = elseIf.getElseElement();
if (element != null) {
result.addAll(expandToWholeLine(editorText,
new TextRange(elseKeyword.getTextRange().getStartOffset(),
elseIf.getThenBranch().getTextRange().getEndOffset()),
false));
final PsiStatement elseThen = elseIf.getThenBranch();
if (elseThen != null) {
result.addAll(expandToWholeLine(editorText,
new TextRange(elseKeyword.getTextRange().getStartOffset(),
elseThen.getTextRange().getEndOffset()),
false));
}
}
}
}