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

Smart enter in function literal expression

Browse Source 
#KT-3600 In Progress
This commit is contained in:
Nikolay Krasko
2014-06-23 18:54:50 +04:00
parent d4ac3454ce
commit 431f3ad185
2 changed files with 70 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/editor/KotlinSmartEnterHandler.kt
+13 -6
View File
@@ -32,6 +32,7 @@ import org.jetbrains.jet.lang.psi.JetDeclarationWithBody
import org.jetbrains.jet.lang.psi.JetIfExpression
import org.jetbrains.jet.lang.psi.JetForExpression
import org.jetbrains.jet.lang.psi.JetParameter
import org.jetbrains.jet.lang.psi.JetFunctionLiteral
import com.intellij.psi.tree.TokenSet
import org.jetbrains.jet.JetNodeTypes
import org.jetbrains.jet.lang.psi.JetLoopExpression
@@ -64,12 +65,17 @@ public class KotlinSmartEnterHandler: SmartEnterProcessorWithFixers() {
if (atCaret is PsiWhiteSpace) return null
while (atCaret != null) {
if (atCaret?.isJetStatement() == true) return atCaret
if (atCaret is JetDeclaration &&
atCaret !is JetParameter &&
(atCaret?.getParent() !is JetForExpression)) {
return atCaret
when {
atCaret?.isJetStatement() == true -> return atCaret
atCaret?.getParent() is JetFunctionLiteral -> return atCaret
atCaret is JetDeclaration -> {
val declaration = atCaret!!
when {
declaration is JetParameter && !declaration.isInLambdaExpression() -> {/* proceed to function declaration */}
declaration.getParent() is JetForExpression -> {/* skip variable declaration in 'for' expression */}
else -> return atCaret
}
}
}
atCaret = atCaret?.getParent()
@@ -152,3 +158,4 @@ public class KotlinSmartEnterHandler: SmartEnterProcessorWithFixers() {
}
private val IF_BRANCHES_CONTAINERS = TokenSet.create(JetNodeTypes.THEN, JetNodeTypes.ELSE)
private fun JetParameter.isInLambdaExpression() = this.getParent()?.getParent() is JetFunctionLiteral
idea/tests/org/jetbrains/jet/plugin/codeInsight/smartEnter/SmartEnterTest.kt
+57 -1
View File
@@ -553,8 +553,8 @@ class SmartEnterTest : JetLightCodeInsightFixtureTestCase() {
,
"""
when ( {
}
<caret>
}
"""
)
@@ -841,6 +841,62 @@ class SmartEnterTest : JetLightCodeInsightFixtureTestCase() {
"""
)
fun testInLambda1() = doFunTest(
"""
some {
p -><caret>
}
""",
"""
some {
p ->
<caret>
}
"""
)
fun testInLambda2() = doFunTest(
"""
some {
p<caret> ->
}
""",
"""
some {
p ->
<caret>
}
"""
)
fun testInLambda3() = doFunTest(
"""
some {
(<caret>p: Int) : Int ->
}
""",
"""
some {
(p: Int) : Int ->
<caret>
}
"""
)
fun testInLambda4() = doFunTest(
"""
some {
(p: <caret>Int) : Int ->
}
""",
"""
some {
(p: Int) : Int ->
<caret>
}
"""
)
fun doFunTest(before: String, after: String) {
fun String.withFunContext(): String {
val bodyText = "//----${this.trimIndent()}//----"