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

Add "arg" postfix template (KT-29398)

Browse Source 
#KT-29398 Fixed
This commit is contained in:
Toshiaki Kameyama
2019-02-27 17:49:42 +03:00
committed by Nikolay Krasko
parent 0c0f035241
commit 6acf3ad629
8 changed files with 36 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/resources/postfixTemplates/KtArgumentPostfixTemplate/after.kt.template
+3
View File
@@ -0,0 +1,3 @@
fun foo(s: String) {
<spot>call(s)</sport>
}
idea/resources/postfixTemplates/KtArgumentPostfixTemplate/before.kt.template
+3
View File
@@ -0,0 +1,3 @@
fun foo(s: String) {
<spot>s</sport>$key
}
idea/resources/postfixTemplates/KtArgumentPostfixTemplate/description.html
+5
View File
@@ -0,0 +1,5 @@
<html>
<body>
Wraps expression with a function call.
</body>
</html>
idea/src/org/jetbrains/kotlin/idea/codeInsight/postfix/KtPostfixTemplateProvider.kt
+2 -1
View File
@@ -63,7 +63,8 @@ class KtPostfixTemplateProvider : PostfixTemplateProvider {
KtWrapWithSetOfPostfixTemplate, KtWrapWithSetOfPostfixTemplate,
KtWrapWithArrayOfPostfixTemplate, KtWrapWithArrayOfPostfixTemplate,
KtWrapWithSequenceOfPostfixTemplate, KtWrapWithSequenceOfPostfixTemplate,
KtSpreadPostfixTemplate KtSpreadPostfixTemplate,
KtArgumentPostfixTemplate
) )
override fun isTerminalSymbol(currentChar: Char) = currentChar == '.' || currentChar == '!' override fun isTerminalSymbol(currentChar: Char) = currentChar == '.' || currentChar == '!'
idea/src/org/jetbrains/kotlin/idea/codeInsight/postfix/stringBasedPostfixTemplates.kt
+12 -1
View File
@@ -119,4 +119,15 @@ internal object KtSpreadPostfixTemplate : ConstantStringBasedPostfixTemplate(
"*expr", "*expr",
"*\$expr$\$END$", "*\$expr$\$END$",
createExpressionSelector(typePredicate = { KotlinBuiltIns.isArray(it) || KotlinBuiltIns.isPrimitiveArray(it) }) createExpressionSelector(typePredicate = { KotlinBuiltIns.isArray(it) || KotlinBuiltIns.isPrimitiveArray(it) })
) )
internal object KtArgumentPostfixTemplate : ConstantStringBasedPostfixTemplate(
"arg",
"functionCall(expr)",
"\$call$(\$expr$\$END$)",
createExpressionSelector(statementsOnly = true)
) {
override fun setVariables(template: Template, element: PsiElement) {
template.addVariable("call", "", "", true)
}
}
idea/testData/codeInsight/postfix/arg.kt
Vendored
+3
View File
@@ -0,0 +1,3 @@
fun foo(s: String) {
s.arg<caret>
}
idea/testData/codeInsight/postfix/arg.kt.after
Vendored
+3
View File
@@ -0,0 +1,3 @@
fun foo(s: String) {
(s<caret>)
}
idea/tests/org/jetbrains/kotlin/idea/codeInsight/postfix/PostfixTemplateProviderTestGenerated.java
Generated
+5
View File
@@ -29,6 +29,11 @@ public class PostfixTemplateProviderTestGenerated extends AbstractPostfixTemplat
KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/postfix"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true); KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/postfix"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
} }
@TestMetadata("arg.kt")
public void testArg() throws Exception {
runTest("idea/testData/codeInsight/postfix/arg.kt");
}
@TestMetadata("assert.kt") @TestMetadata("assert.kt")
public void testAssert() throws Exception { public void testAssert() throws Exception {
runTest("idea/testData/codeInsight/postfix/assert.kt"); runTest("idea/testData/codeInsight/postfix/assert.kt");