From 5c1e17c8e7d0f70c42400291b8cb5ae38506ee10 Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Thu, 19 May 2016 14:09:05 +0300 Subject: [PATCH] Revert "Completion fix for reserved 'async' syntax" This reverts commit 318f0c89b231515a4823e1d455c376f61bd93316. --- .../handlers/KotlinFunctionInsertHandler.kt | 13 ++------ .../highOrderFunctions/async/AsyncSimple.kt | 7 ---- .../async/AsyncSimple.kt.after | 7 ---- .../async/AsyncWithoutLambda.kt | 7 ---- .../async/AsyncWithoutLambda.kt.after | 7 ---- .../async/FromFooToAsync.kt | 10 ------ .../async/FromFooToAsync.kt.after | 10 ------ .../async/FromFooToAsync2.kt | 10 ------ .../async/FromFooToAsync2.kt.after | 10 ------ .../BasicCompletionHandlerTestGenerated.java | 33 ------------------- 10 files changed, 3 insertions(+), 111 deletions(-) delete mode 100644 idea/idea-completion/testData/handlers/basic/highOrderFunctions/async/AsyncSimple.kt delete mode 100644 idea/idea-completion/testData/handlers/basic/highOrderFunctions/async/AsyncSimple.kt.after delete mode 100644 idea/idea-completion/testData/handlers/basic/highOrderFunctions/async/AsyncWithoutLambda.kt delete mode 100644 idea/idea-completion/testData/handlers/basic/highOrderFunctions/async/AsyncWithoutLambda.kt.after delete mode 100644 idea/idea-completion/testData/handlers/basic/highOrderFunctions/async/FromFooToAsync.kt delete mode 100644 idea/idea-completion/testData/handlers/basic/highOrderFunctions/async/FromFooToAsync.kt.after delete mode 100644 idea/idea-completion/testData/handlers/basic/highOrderFunctions/async/FromFooToAsync2.kt delete mode 100644 idea/idea-completion/testData/handlers/basic/highOrderFunctions/async/FromFooToAsync2.kt.after diff --git a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/handlers/KotlinFunctionInsertHandler.kt b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/handlers/KotlinFunctionInsertHandler.kt index 7d917c7acc5..738b53c7823 100644 --- a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/handlers/KotlinFunctionInsertHandler.kt +++ b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/handlers/KotlinFunctionInsertHandler.kt @@ -25,7 +25,6 @@ import com.intellij.openapi.util.TextRange import com.intellij.psi.PsiDocumentManager import com.intellij.psi.PsiElement import com.intellij.psi.codeStyle.CodeStyleSettingsManager -import org.jetbrains.kotlin.idea.core.completion.DeclarationLookupObject import org.jetbrains.kotlin.idea.core.formatter.KotlinCodeStyleSettings import org.jetbrains.kotlin.idea.util.CallType import org.jetbrains.kotlin.lexer.KtTokens @@ -77,10 +76,10 @@ sealed class KotlinFunctionInsertHandler(callType: CallType<*>) : KotlinCallable val startOffset = context.startOffset val element = context.file.findElementAt(startOffset) ?: return - addArguments(context, element, item) + addArguments(context, element) } - private fun addArguments(context: InsertionContext, offsetElement: PsiElement, item: LookupElement) { + private fun addArguments(context : InsertionContext, offsetElement : PsiElement) { val completionChar = context.completionChar if (completionChar == '(') { //TODO: more correct behavior related to braces type context.setAddCompletionChar(false) @@ -126,12 +125,6 @@ sealed class KotlinFunctionInsertHandler(callType: CallType<*>) : KotlinCallable offset += 2 } - // insert additional brackets for reserved syntax: "async {}" - if (insertLambda && (item.`object` as? DeclarationLookupObject)?.name?.identifier == "async") { - document.insertString(offset, "()") - offset += 2 - } - var openingBracketOffset = chars.indexOfSkippingSpace(openingBracket, offset) var closeBracketOffset = openingBracketOffset?.let { chars.indexOfSkippingSpace(closingBracket, it + 1) } var inBracketsShift = 0 @@ -219,4 +212,4 @@ sealed class KotlinFunctionInsertHandler(callType: CallType<*>) : KotlinCallable psiDocumentManager.commitAllDocuments() psiDocumentManager.doPostponedOperationsAndUnblockDocument(context.document) } -} \ No newline at end of file +} diff --git a/idea/idea-completion/testData/handlers/basic/highOrderFunctions/async/AsyncSimple.kt b/idea/idea-completion/testData/handlers/basic/highOrderFunctions/async/AsyncSimple.kt deleted file mode 100644 index d3aa295d015..00000000000 --- a/idea/idea-completion/testData/handlers/basic/highOrderFunctions/async/AsyncSimple.kt +++ /dev/null @@ -1,7 +0,0 @@ -fun async(a: () -> Unit) {} - -fun test() { - asy -} - -// ELEMENT: async diff --git a/idea/idea-completion/testData/handlers/basic/highOrderFunctions/async/AsyncSimple.kt.after b/idea/idea-completion/testData/handlers/basic/highOrderFunctions/async/AsyncSimple.kt.after deleted file mode 100644 index da8f6c27b6d..00000000000 --- a/idea/idea-completion/testData/handlers/basic/highOrderFunctions/async/AsyncSimple.kt.after +++ /dev/null @@ -1,7 +0,0 @@ -fun async(a: () -> Unit) {} - -fun test() { - async() { } -} - -// ELEMENT: async diff --git a/idea/idea-completion/testData/handlers/basic/highOrderFunctions/async/AsyncWithoutLambda.kt b/idea/idea-completion/testData/handlers/basic/highOrderFunctions/async/AsyncWithoutLambda.kt deleted file mode 100644 index 061f41ec1b5..00000000000 --- a/idea/idea-completion/testData/handlers/basic/highOrderFunctions/async/AsyncWithoutLambda.kt +++ /dev/null @@ -1,7 +0,0 @@ -fun async (p: Int, a: () -> Unit) {} - -fun test() { - asy -} - -// ELEMENT: async diff --git a/idea/idea-completion/testData/handlers/basic/highOrderFunctions/async/AsyncWithoutLambda.kt.after b/idea/idea-completion/testData/handlers/basic/highOrderFunctions/async/AsyncWithoutLambda.kt.after deleted file mode 100644 index 0f67c61514f..00000000000 --- a/idea/idea-completion/testData/handlers/basic/highOrderFunctions/async/AsyncWithoutLambda.kt.after +++ /dev/null @@ -1,7 +0,0 @@ -fun async (p: Int, a: () -> Unit) {} - -fun test() { - async() -} - -// ELEMENT: async diff --git a/idea/idea-completion/testData/handlers/basic/highOrderFunctions/async/FromFooToAsync.kt b/idea/idea-completion/testData/handlers/basic/highOrderFunctions/async/FromFooToAsync.kt deleted file mode 100644 index 23812563eac..00000000000 --- a/idea/idea-completion/testData/handlers/basic/highOrderFunctions/async/FromFooToAsync.kt +++ /dev/null @@ -1,10 +0,0 @@ -fun asyFoo(a: () -> Unit) {} - -fun async(a: () -> Unit) {} - -fun test() { - asyFoo { } -} - -// ELEMENT: async -// CHAR: '\t' \ No newline at end of file diff --git a/idea/idea-completion/testData/handlers/basic/highOrderFunctions/async/FromFooToAsync.kt.after b/idea/idea-completion/testData/handlers/basic/highOrderFunctions/async/FromFooToAsync.kt.after deleted file mode 100644 index 872816b85fd..00000000000 --- a/idea/idea-completion/testData/handlers/basic/highOrderFunctions/async/FromFooToAsync.kt.after +++ /dev/null @@ -1,10 +0,0 @@ -fun asyFoo(a: () -> Unit) {} - -fun async(a: () -> Unit) {} - -fun test() { - async() { } -} - -// ELEMENT: async -// CHAR: '\t' \ No newline at end of file diff --git a/idea/idea-completion/testData/handlers/basic/highOrderFunctions/async/FromFooToAsync2.kt b/idea/idea-completion/testData/handlers/basic/highOrderFunctions/async/FromFooToAsync2.kt deleted file mode 100644 index 3a803cec1ad..00000000000 --- a/idea/idea-completion/testData/handlers/basic/highOrderFunctions/async/FromFooToAsync2.kt +++ /dev/null @@ -1,10 +0,0 @@ -fun asyFoo(p: Int, a: () -> Unit) {} - -fun async(q: Int, a: () -> Unit) {} - -fun test() { - asyFoo(5) { } -} - -// ELEMENT: async -// CHAR: '\t' \ No newline at end of file diff --git a/idea/idea-completion/testData/handlers/basic/highOrderFunctions/async/FromFooToAsync2.kt.after b/idea/idea-completion/testData/handlers/basic/highOrderFunctions/async/FromFooToAsync2.kt.after deleted file mode 100644 index 4434077c803..00000000000 --- a/idea/idea-completion/testData/handlers/basic/highOrderFunctions/async/FromFooToAsync2.kt.after +++ /dev/null @@ -1,10 +0,0 @@ -fun asyFoo(p: Int, a: () -> Unit) {} - -fun async(q: Int, a: () -> Unit) {} - -fun test() { - async(5) { } -} - -// ELEMENT: async -// CHAR: '\t' \ No newline at end of file diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/BasicCompletionHandlerTestGenerated.java b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/BasicCompletionHandlerTestGenerated.java index 86ee21ba160..36f36385f9d 100644 --- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/BasicCompletionHandlerTestGenerated.java +++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/BasicCompletionHandlerTestGenerated.java @@ -402,39 +402,6 @@ public class BasicCompletionHandlerTestGenerated extends AbstractBasicCompletion String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/highOrderFunctions/WithArgsNonEmptyLambdaAfter.kt"); doTest(fileName); } - - @TestMetadata("idea/idea-completion/testData/handlers/basic/highOrderFunctions/async") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Async extends AbstractBasicCompletionHandlerTest { - public void testAllFilesPresentInAsync() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/handlers/basic/highOrderFunctions/async"), Pattern.compile("^(.+)\\.kt$"), true); - } - - @TestMetadata("AsyncSimple.kt") - public void testAsyncSimple() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/highOrderFunctions/async/AsyncSimple.kt"); - doTest(fileName); - } - - @TestMetadata("AsyncWithoutLambda.kt") - public void testAsyncWithoutLambda() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/highOrderFunctions/async/AsyncWithoutLambda.kt"); - doTest(fileName); - } - - @TestMetadata("FromFooToAsync.kt") - public void testFromFooToAsync() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/highOrderFunctions/async/FromFooToAsync.kt"); - doTest(fileName); - } - - @TestMetadata("FromFooToAsync2.kt") - public void testFromFooToAsync2() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/highOrderFunctions/async/FromFooToAsync2.kt"); - doTest(fileName); - } - } } @TestMetadata("idea/idea-completion/testData/handlers/basic/override")