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

Fixed EA-50672.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2014-10-10 19:43:28 +04:00
parent 05677e26a4
commit 745a7333b1
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/editor/wordSelection/JetCodeBlockSelectioner.java
+6 -1
View File
@@ -24,6 +24,7 @@ import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiWhiteSpace; import com.intellij.psi.PsiWhiteSpace;
import com.intellij.psi.impl.source.tree.LeafPsiElement; import com.intellij.psi.impl.source.tree.LeafPsiElement;
import org.jetbrains.jet.lang.psi.JetBlockExpression; import org.jetbrains.jet.lang.psi.JetBlockExpression;
import org.jetbrains.jet.lang.psi.JetPsiUtil;
import org.jetbrains.jet.lang.psi.JetWhenExpression; import org.jetbrains.jet.lang.psi.JetWhenExpression;
import org.jetbrains.jet.lexer.JetTokens; import org.jetbrains.jet.lexer.JetTokens;
@@ -41,12 +42,16 @@ public class JetCodeBlockSelectioner extends BasicSelectioner {
public List<TextRange> select(PsiElement e, CharSequence editorText, int cursorOffset, Editor editor) { public List<TextRange> select(PsiElement e, CharSequence editorText, int cursorOffset, Editor editor) {
List<TextRange> result = new ArrayList<TextRange>(); List<TextRange> result = new ArrayList<TextRange>();
result.add(e.getTextRange());
ASTNode[] children = e.getNode().getChildren(null); ASTNode[] children = e.getNode().getChildren(null);
if (children.length == 0) {
return result;
}
int start = findOpeningBrace(children); int start = findOpeningBrace(children);
int end = findClosingBrace(children, start); int end = findClosingBrace(children, start);
result.add(e.getTextRange());
result.addAll(expandToWholeLine(editorText, new TextRange(start, end))); result.addAll(expandToWholeLine(editorText, new TextRange(start, end)));
return result; return result;