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

Refactored code

Browse Source
This commit is contained in:
Valentin Kipyatkov
2014-10-01 22:06:54 +04:00
parent f22e14571f
commit f4c9eabd1d
1 changed files with 18 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/editor/wordSelection/JetStatementGroupSelectioner.kt
+18 -32
View File
@@ -29,8 +29,8 @@ import org.jetbrains.jet.lang.psi.JetWhenEntry
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
import java.util.ArrayList
import com.intellij.codeInsight.editorActions.ExtendWordSelectionHandlerBase import com.intellij.codeInsight.editorActions.ExtendWordSelectionHandlerBase
import org.jetbrains.jet.lang.psi.psiUtil.siblings
/** /**
* Originally from IDEA platform: StatementGroupSelectioner * Originally from IDEA platform: StatementGroupSelectioner
@@ -41,39 +41,25 @@ public class JetStatementGroupSelectioner : BasicSelectioner() {
override fun select(e: PsiElement, editorText: CharSequence, cursorOffset: Int, editor: Editor): List<TextRange> { override fun select(e: PsiElement, editorText: CharSequence, cursorOffset: Int, editor: Editor): List<TextRange> {
val parent = e.getParent() val parent = e.getParent()
if (parent !is JetBlockExpression && parent !is JetWhenExpression) { if (parent !is JetBlockExpression && parent !is JetWhenExpression) return listOf()
return listOf()
}
var startElement = e val startElement = e.siblings(forward = false, withItself = false)
while (startElement.getPrevSibling() != null) { .firstOrNull { // find preceding '{' or blank line
val sibling = startElement.getPrevSibling() it is LeafPsiElement && it.getElementType() == JetTokens.LBRACE ||
it is PsiWhiteSpace && it.getText()!!.count { it == '\n' } > 1
}
?.siblings(forward = true, withItself = false)
?.dropWhile { it is PsiWhiteSpace } // and take first non-whitespace element after it
?.firstOrNull() ?: parent.getFirstChild()!!
if (sibling is LeafPsiElement && sibling.getElementType() == JetTokens.LBRACE) break val endElement = e.siblings(forward = true, withItself = false)
.firstOrNull { // find next '}' or blank line
if (sibling is PsiWhiteSpace && LineTokenizer.tokenize(sibling.getText()!!.toCharArray(), false).size > 2) break it is LeafPsiElement && it.getElementType() == JetTokens.RBRACE ||
it is PsiWhiteSpace && it.getText()!!.count { it == '\n' } > 1
startElement = sibling!! }
} ?.siblings(forward = false, withItself = false)
?.dropWhile { it is PsiWhiteSpace } // and take first non-whitespace element before it
while (startElement is PsiWhiteSpace) { ?.firstOrNull() ?: parent.getLastChild()!!
startElement = startElement.getNextSibling()!!
}
var endElement = e
while (endElement.getNextSibling() != null) {
val sibling = endElement.getNextSibling()
if (sibling is LeafPsiElement && sibling.getElementType() == JetTokens.RBRACE) break
if (sibling is PsiWhiteSpace && LineTokenizer.tokenize(sibling.getText()!!.toCharArray(), false).size > 2) break
endElement = sibling!!
}
while (endElement is PsiWhiteSpace) {
endElement = endElement.getPrevSibling()!!
}
return ExtendWordSelectionHandlerBase.expandToWholeLine(editorText, TextRange(startElement.getTextRange()!!.getStartOffset(), endElement.getTextRange()!!.getEndOffset())) return ExtendWordSelectionHandlerBase.expandToWholeLine(editorText, TextRange(startElement.getTextRange()!!.getStartOffset(), endElement.getTextRange()!!.getEndOffset()))
} }