From fd262bcd8dd2cbfc8ba5c09577e645fb3588eb71 Mon Sep 17 00:00:00 2001 From: Toshiaki Kameyama Date: Sat, 9 Mar 2019 03:15:37 +0300 Subject: [PATCH] Smart completion: fix anonymous object code style (KT-29572) #KT-29572 Fixed --- .../idea/completion/smart/TypeInstantiationItems.kt | 4 ++-- .../multifile/smart/AnonymousObjectGenericJava.kt.after | 2 +- .../testData/handlers/smart/AnonymousObject1.kt.after | 2 +- .../testData/handlers/smart/AnonymousObject2.kt.after | 2 +- .../testData/handlers/smart/AnonymousObject3.kt.after | 2 +- .../handlers/smart/AnonymousObjectInsertsImport.kt | 2 +- .../handlers/smart/AnonymousObjectInsertsImport.kt.after | 4 ++-- .../smart/AnonymousObjectUninferredTypeArgs.kt.after | 2 +- .../testData/handlers/smart/Comma8.kt.after | 2 +- .../handlers/smart/ConstructorForGenericType2.kt.after | 2 +- idea/idea-completion/testData/smart/SAMExpected2.kt | 2 +- idea/idea-completion/testData/smart/anonymousObject/1.kt | 2 +- idea/idea-completion/testData/smart/anonymousObject/2.kt | 2 +- .../testData/smart/anonymousObject/ForJavaInterface.kt | 2 +- .../testData/smart/anonymousObject/UninferredTypeArgs.kt | 2 +- .../testData/smart/anonymousObject/WithPrefix.kt | 2 +- .../smart/constructor/ProtectedConstructorForAbstract.kt | 2 +- .../testData/smart/inheritors/GenericClass1.kt | 6 +++--- .../testData/smart/inheritors/GenericClass2.kt | 8 ++++---- .../testData/smart/inheritors/GenericClass3.kt | 8 ++++---- .../testData/smart/inheritors/GenericClass4.kt | 4 ++-- .../testData/smart/inheritors/GenericClass5.kt | 4 ++-- .../testData/smart/inheritors/GenericClass6.kt | 6 +++--- .../AnonymousObjectGenericJava.kt | 2 +- .../GenericInheritors1/GenericInheritors1.kt | 4 ++-- .../GenericInheritors2/GenericInheritors2.kt | 2 +- .../GenericInheritors3/GenericInheritors3.kt | 2 +- .../GenericInheritors4/GenericInheritors4.kt | 2 +- .../testData/smartMultiFile/Inheritors/Inheritors.kt | 6 +++--- .../InheritorsAndMultipleExpectedTypes.kt | 6 +++--- .../NoObjectDuplication/NoObjectDuplication.kt | 2 +- 31 files changed, 50 insertions(+), 50 deletions(-) diff --git a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/smart/TypeInstantiationItems.kt b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/smart/TypeInstantiationItems.kt index 19421e7d39b..19854b2a8bd 100644 --- a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/smart/TypeInstantiationItems.kt +++ b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/smart/TypeInstantiationItems.kt @@ -185,13 +185,13 @@ class TypeInstantiationItems( val constructorParenthesis = if (classifier.kind != ClassKind.INTERFACE) "()" else "" itemText += constructorParenthesis - itemText = "object: $itemText{...}" + itemText = "object : $itemText{...}" lookupString = "object" allLookupStrings = setOf(lookupString, lookupElement.lookupString) insertHandler = InsertHandler { context, _ -> val startOffset = context.startOffset - val text1 = "object: $typeText" + val text1 = "object : $typeText" val text2 = "$constructorParenthesis {}" val text = if (allTypeArgsKnown) text1 + IdeDescriptorRenderers.SOURCE_CODE.renderTypeArguments(typeArgsToUse) + text2 diff --git a/idea/idea-completion/testData/handlers/multifile/smart/AnonymousObjectGenericJava.kt.after b/idea/idea-completion/testData/handlers/multifile/smart/AnonymousObjectGenericJava.kt.after index 9e917a65454..b4f038c8adb 100644 --- a/idea/idea-completion/testData/handlers/multifile/smart/AnonymousObjectGenericJava.kt.after +++ b/idea/idea-completion/testData/handlers/multifile/smart/AnonymousObjectGenericJava.kt.after @@ -1,5 +1,5 @@ fun f(){ - JavaClass(object: Comparator { + JavaClass(object : Comparator { override fun compare(var1: T, var2: T): Int { TODO("not implemented") //To change body of created functions use File | Settings | File Templates. } diff --git a/idea/idea-completion/testData/handlers/smart/AnonymousObject1.kt.after b/idea/idea-completion/testData/handlers/smart/AnonymousObject1.kt.after index 13e969fccc9..f6d7ee06891 100644 --- a/idea/idea-completion/testData/handlers/smart/AnonymousObject1.kt.after +++ b/idea/idea-completion/testData/handlers/smart/AnonymousObject1.kt.after @@ -1,5 +1,5 @@ interface Foo -var a : Foo = object: Foo {} +var a : Foo = object : Foo {} //ELEMENT: object diff --git a/idea/idea-completion/testData/handlers/smart/AnonymousObject2.kt.after b/idea/idea-completion/testData/handlers/smart/AnonymousObject2.kt.after index 244e76ba86e..0ae66a40336 100644 --- a/idea/idea-completion/testData/handlers/smart/AnonymousObject2.kt.after +++ b/idea/idea-completion/testData/handlers/smart/AnonymousObject2.kt.after @@ -1,5 +1,5 @@ abstract class Foo -var a : Foo = object: Foo() {} +var a : Foo = object : Foo() {} //ELEMENT: object diff --git a/idea/idea-completion/testData/handlers/smart/AnonymousObject3.kt.after b/idea/idea-completion/testData/handlers/smart/AnonymousObject3.kt.after index e1711c69c50..f8d4edf0fbf 100644 --- a/idea/idea-completion/testData/handlers/smart/AnonymousObject3.kt.after +++ b/idea/idea-completion/testData/handlers/smart/AnonymousObject3.kt.after @@ -1,4 +1,4 @@ -var r : Runnable = object: Runnable { +var r : Runnable = object : Runnable { override fun run() { TODO("not implemented") //To change body of created functions use File | Settings | File Templates. } diff --git a/idea/idea-completion/testData/handlers/smart/AnonymousObjectInsertsImport.kt b/idea/idea-completion/testData/handlers/smart/AnonymousObjectInsertsImport.kt index a6b4b03013c..6bf296b801c 100644 --- a/idea/idea-completion/testData/handlers/smart/AnonymousObjectInsertsImport.kt +++ b/idea/idea-completion/testData/handlers/smart/AnonymousObjectInsertsImport.kt @@ -1,3 +1,3 @@ val c: java.io.Closeable = -//ELEMENT_TEXT: "object: Closeable{...}" +//ELEMENT_TEXT: "object : Closeable{...}" diff --git a/idea/idea-completion/testData/handlers/smart/AnonymousObjectInsertsImport.kt.after b/idea/idea-completion/testData/handlers/smart/AnonymousObjectInsertsImport.kt.after index a9883e741a3..2368557b24a 100644 --- a/idea/idea-completion/testData/handlers/smart/AnonymousObjectInsertsImport.kt.after +++ b/idea/idea-completion/testData/handlers/smart/AnonymousObjectInsertsImport.kt.after @@ -1,9 +1,9 @@ import java.io.Closeable -val c: java.io.Closeable = object: Closeable { +val c: java.io.Closeable = object : Closeable { override fun close() { TODO("not implemented") //To change body of created functions use File | Settings | File Templates. } } -//ELEMENT_TEXT: "object: Closeable{...}" +//ELEMENT_TEXT: "object : Closeable{...}" diff --git a/idea/idea-completion/testData/handlers/smart/AnonymousObjectUninferredTypeArgs.kt.after b/idea/idea-completion/testData/handlers/smart/AnonymousObjectUninferredTypeArgs.kt.after index 389a9aae67f..0c6fff5617e 100644 --- a/idea/idea-completion/testData/handlers/smart/AnonymousObjectUninferredTypeArgs.kt.after +++ b/idea/idea-completion/testData/handlers/smart/AnonymousObjectUninferredTypeArgs.kt.after @@ -3,7 +3,7 @@ interface A fun foo(a: A){} fun g() { - foo(object: A<> {}) + foo(object : A<> {}) } // ELEMENT: object \ No newline at end of file diff --git a/idea/idea-completion/testData/handlers/smart/Comma8.kt.after b/idea/idea-completion/testData/handlers/smart/Comma8.kt.after index a23b4152b37..8cdd5b1715e 100644 --- a/idea/idea-completion/testData/handlers/smart/Comma8.kt.after +++ b/idea/idea-completion/testData/handlers/smart/Comma8.kt.after @@ -3,7 +3,7 @@ interface Foo fun foo(f: Foo, i: Int){} fun bar() { - foo(object: Foo {}, ) + foo(object : Foo {}, ) } //ELEMENT: object diff --git a/idea/idea-completion/testData/handlers/smart/ConstructorForGenericType2.kt.after b/idea/idea-completion/testData/handlers/smart/ConstructorForGenericType2.kt.after index 3b0e511023a..49b637e2db4 100644 --- a/idea/idea-completion/testData/handlers/smart/ConstructorForGenericType2.kt.after +++ b/idea/idea-completion/testData/handlers/smart/ConstructorForGenericType2.kt.after @@ -1,7 +1,7 @@ fun registerHandler(handler: Handler) {} fun test() { - registerHandler(object: Handler { + registerHandler(object : Handler { override fun handle(e: Message) { TODO("not implemented") //To change body of created functions use File | Settings | File Templates. } diff --git a/idea/idea-completion/testData/smart/SAMExpected2.kt b/idea/idea-completion/testData/smart/SAMExpected2.kt index 9df777f09de..54d5527539a 100644 --- a/idea/idea-completion/testData/smart/SAMExpected2.kt +++ b/idea/idea-completion/testData/smart/SAMExpected2.kt @@ -2,6 +2,6 @@ import java.util.Comparator var v: Comparator = -// EXIST: { itemText: "object: Comparator{...}" } +// EXIST: { itemText: "object : Comparator{...}" } // EXIST: { lookupString: "Comparator", itemText: "Comparator", tailText: "(function: (T!, T!) -> Int) (java.util)", typeText: "Comparator" } // EXIST: { lookupString: "Comparator", itemText: "Comparator", tailText: " { T, T -> ... } (function: (T!, T!) -> Int) (java.util)", typeText: "Comparator" } diff --git a/idea/idea-completion/testData/smart/anonymousObject/1.kt b/idea/idea-completion/testData/smart/anonymousObject/1.kt index 66ac417e3d2..45e02e22e5f 100644 --- a/idea/idea-completion/testData/smart/anonymousObject/1.kt +++ b/idea/idea-completion/testData/smart/anonymousObject/1.kt @@ -3,4 +3,4 @@ interface Foo var a : Foo = // ABSENT: Foo -// EXIST: { lookupString:"object", itemText:"object: Foo{...}" } +// EXIST: { lookupString:"object", itemText:"object : Foo{...}" } diff --git a/idea/idea-completion/testData/smart/anonymousObject/2.kt b/idea/idea-completion/testData/smart/anonymousObject/2.kt index 74ee08a1b9c..50464b083f0 100644 --- a/idea/idea-completion/testData/smart/anonymousObject/2.kt +++ b/idea/idea-completion/testData/smart/anonymousObject/2.kt @@ -3,4 +3,4 @@ abstract class Foo var a : Foo = // ABSENT: Foo -// EXIST: { lookupString:"object", itemText:"object: Foo(){...}" } +// EXIST: { lookupString:"object", itemText:"object : Foo(){...}" } diff --git a/idea/idea-completion/testData/smart/anonymousObject/ForJavaInterface.kt b/idea/idea-completion/testData/smart/anonymousObject/ForJavaInterface.kt index 326935a2fe6..9d9fedbe6d0 100644 --- a/idea/idea-completion/testData/smart/anonymousObject/ForJavaInterface.kt +++ b/idea/idea-completion/testData/smart/anonymousObject/ForJavaInterface.kt @@ -1,4 +1,4 @@ var a : Appendable = // ABSENT: Appendable -// EXIST: { lookupString:"object", itemText:"object: Appendable{...}" } \ No newline at end of file +// EXIST: { lookupString:"object", itemText:"object : Appendable{...}" } \ No newline at end of file diff --git a/idea/idea-completion/testData/smart/anonymousObject/UninferredTypeArgs.kt b/idea/idea-completion/testData/smart/anonymousObject/UninferredTypeArgs.kt index e79c8c6c230..ee63bd01ea6 100644 --- a/idea/idea-completion/testData/smart/anonymousObject/UninferredTypeArgs.kt +++ b/idea/idea-completion/testData/smart/anonymousObject/UninferredTypeArgs.kt @@ -6,4 +6,4 @@ fun g() { foo() } -// EXIST: { lookupString:"object", itemText:"object: A<...>{...}" } +// EXIST: { lookupString:"object", itemText:"object : A<...>{...}" } diff --git a/idea/idea-completion/testData/smart/anonymousObject/WithPrefix.kt b/idea/idea-completion/testData/smart/anonymousObject/WithPrefix.kt index 8901d4024e4..b4afbb9fe0e 100644 --- a/idea/idea-completion/testData/smart/anonymousObject/WithPrefix.kt +++ b/idea/idea-completion/testData/smart/anonymousObject/WithPrefix.kt @@ -2,4 +2,4 @@ interface Foo var a : Foo = o -// EXIST: { lookupString:"object", itemText:"object: Foo{...}" } +// EXIST: { lookupString:"object", itemText:"object : Foo{...}" } diff --git a/idea/idea-completion/testData/smart/constructor/ProtectedConstructorForAbstract.kt b/idea/idea-completion/testData/smart/constructor/ProtectedConstructorForAbstract.kt index 00d9ad94c59..643e541e01c 100644 --- a/idea/idea-completion/testData/smart/constructor/ProtectedConstructorForAbstract.kt +++ b/idea/idea-completion/testData/smart/constructor/ProtectedConstructorForAbstract.kt @@ -3,4 +3,4 @@ abstract class Foo protected() var a : Foo = // ABSENT: Foo -// EXIST: { lookupString:"object", itemText:"object: Foo(){...}" } +// EXIST: { lookupString:"object", itemText:"object : Foo(){...}" } diff --git a/idea/idea-completion/testData/smart/inheritors/GenericClass1.kt b/idea/idea-completion/testData/smart/inheritors/GenericClass1.kt index 68ae678ecd6..dda6d343b38 100644 --- a/idea/idea-completion/testData/smart/inheritors/GenericClass1.kt +++ b/idea/idea-completion/testData/smart/inheritors/GenericClass1.kt @@ -12,9 +12,9 @@ fun bar() { foo() } -// EXIST: { itemText: "object: I{...}" } -// EXIST: { itemText: "object: C1(){...}" } -// EXIST: { itemText: "object: C3(){...}" } +// EXIST: { itemText: "object : I{...}" } +// EXIST: { itemText: "object : C1(){...}" } +// EXIST: { itemText: "object : C3(){...}" } // EXIST: { itemText: "C4", tailText: "(t: Int) ()" } // EXIST: { itemText: "C5", tailText: "(t1: T1, t2: Int) ()" } // NOTHING_ELSE diff --git a/idea/idea-completion/testData/smart/inheritors/GenericClass2.kt b/idea/idea-completion/testData/smart/inheritors/GenericClass2.kt index ba5f828875e..44050a57f17 100644 --- a/idea/idea-completion/testData/smart/inheritors/GenericClass2.kt +++ b/idea/idea-completion/testData/smart/inheritors/GenericClass2.kt @@ -10,10 +10,10 @@ fun bar() { foo() } -// EXIST: { itemText: "object: I<...>{...}" } -// EXIST: { itemText: "object: C1<...>(){...}" } -// EXIST: { itemText: "object: C2(){...}" } -// EXIST: { itemText: "object: C3(){...}" } +// EXIST: { itemText: "object : I<...>{...}" } +// EXIST: { itemText: "object : C1<...>(){...}" } +// EXIST: { itemText: "object : C2(){...}" } +// EXIST: { itemText: "object : C3(){...}" } // all these items shouldn't be proposed, see KT-15479 // EXIST: { itemText: "enumValueOf" } diff --git a/idea/idea-completion/testData/smart/inheritors/GenericClass3.kt b/idea/idea-completion/testData/smart/inheritors/GenericClass3.kt index 12896bc5652..ae8aef8864e 100644 --- a/idea/idea-completion/testData/smart/inheritors/GenericClass3.kt +++ b/idea/idea-completion/testData/smart/inheritors/GenericClass3.kt @@ -11,10 +11,10 @@ fun bar() { foo() } -// EXIST: { itemText: "object: I<...>{...}" } -// EXIST: { itemText: "object: C1<...>(){...}" } -// EXIST: { itemText: "object: C2(){...}" } -// EXIST: { itemText: "object: C4(){...}" } +// EXIST: { itemText: "object : I<...>{...}" } +// EXIST: { itemText: "object : C1<...>(){...}" } +// EXIST: { itemText: "object : C2(){...}" } +// EXIST: { itemText: "object : C4(){...}" } // all these items shouldn't be proposed, see KT-15479 // EXIST: { itemText: "enumValueOf" } diff --git a/idea/idea-completion/testData/smart/inheritors/GenericClass4.kt b/idea/idea-completion/testData/smart/inheritors/GenericClass4.kt index 12d861ca5e6..19313afa6f4 100644 --- a/idea/idea-completion/testData/smart/inheritors/GenericClass4.kt +++ b/idea/idea-completion/testData/smart/inheritors/GenericClass4.kt @@ -8,8 +8,8 @@ fun bar() { foo() } -// EXIST: { itemText: "object: I<...>{...}" } -// EXIST: { itemText: "object: C<...>(){...}" } +// EXIST: { itemText: "object : I<...>{...}" } +// EXIST: { itemText: "object : C<...>(){...}" } // all these items shouldn't be proposed, see KT-15479 // EXIST: { itemText: "enumValueOf" } diff --git a/idea/idea-completion/testData/smart/inheritors/GenericClass5.kt b/idea/idea-completion/testData/smart/inheritors/GenericClass5.kt index 32760493742..dec153ccdee 100644 --- a/idea/idea-completion/testData/smart/inheritors/GenericClass5.kt +++ b/idea/idea-completion/testData/smart/inheritors/GenericClass5.kt @@ -8,6 +8,6 @@ fun bar() { foo() } -// EXIST: { itemText: "object: I{...}" } -// EXIST: { itemText: "object: C<...>(){...}" } +// EXIST: { itemText: "object : I{...}" } +// EXIST: { itemText: "object : C<...>(){...}" } // NOTHING_ELSE diff --git a/idea/idea-completion/testData/smart/inheritors/GenericClass6.kt b/idea/idea-completion/testData/smart/inheritors/GenericClass6.kt index ef2a74a9919..9dd034249d5 100644 --- a/idea/idea-completion/testData/smart/inheritors/GenericClass6.kt +++ b/idea/idea-completion/testData/smart/inheritors/GenericClass6.kt @@ -14,9 +14,9 @@ fun bar() { foo() } -// EXIST: { itemText: "object: I<...>{...}" } -// EXIST: { itemText: "object: C1(){...}" } -// EXIST: { itemText: "object: C2(){...}" } +// EXIST: { itemText: "object : I<...>{...}" } +// EXIST: { itemText: "object : C1(){...}" } +// EXIST: { itemText: "object : C2(){...}" } // all these items shouldn't be proposed, see KT-15479 // EXIST: { itemText: "enumValueOf" } diff --git a/idea/idea-completion/testData/smartMultiFile/AnonymousObjectGenericJava/AnonymousObjectGenericJava.kt b/idea/idea-completion/testData/smartMultiFile/AnonymousObjectGenericJava/AnonymousObjectGenericJava.kt index 7fbff60b70f..af6231936f5 100644 --- a/idea/idea-completion/testData/smartMultiFile/AnonymousObjectGenericJava/AnonymousObjectGenericJava.kt +++ b/idea/idea-completion/testData/smartMultiFile/AnonymousObjectGenericJava/AnonymousObjectGenericJava.kt @@ -2,4 +2,4 @@ fun f(){ JavaClass() } -// EXIST: { itemText: "object: Comparator{...}" } +// EXIST: { itemText: "object : Comparator{...}" } diff --git a/idea/idea-completion/testData/smartMultiFile/GenericInheritors1/GenericInheritors1.kt b/idea/idea-completion/testData/smartMultiFile/GenericInheritors1/GenericInheritors1.kt index 436e994aee0..7cdc43b6a1d 100644 --- a/idea/idea-completion/testData/smartMultiFile/GenericInheritors1/GenericInheritors1.kt +++ b/idea/idea-completion/testData/smartMultiFile/GenericInheritors1/GenericInheritors1.kt @@ -4,11 +4,11 @@ fun foo(): KotlinTrait { return } -// EXIST: { lookupString: "object", itemText: "object: KotlinTrait{...}" } +// EXIST: { lookupString: "object", itemText: "object : KotlinTrait{...}" } // EXIST: { lookupString: "KotlinInheritor1", itemText: "KotlinInheritor1", tailText: "() (p)" } // EXIST: { lookupString: "KotlinInheritor2", itemText: "KotlinInheritor2", tailText: "() (p)" } // ABSENT: KotlinInheritor3 -// EXIST: { lookupString: "object", itemText: "object: KotlinInheritor4(){...}" } +// EXIST: { lookupString: "object", itemText: "object : KotlinInheritor4(){...}" } // ABSENT: KotlinInheritor5 // EXIST: { lookupString: "KotlinInheritor6", itemText: "KotlinInheritor6", tailText: "() (p)" } // EXIST: { lookupString: "JavaInheritor1", itemText: "JavaInheritor1", tailText: "() ()" } diff --git a/idea/idea-completion/testData/smartMultiFile/GenericInheritors2/GenericInheritors2.kt b/idea/idea-completion/testData/smartMultiFile/GenericInheritors2/GenericInheritors2.kt index ed1d3260e09..f3a284315cd 100644 --- a/idea/idea-completion/testData/smartMultiFile/GenericInheritors2/GenericInheritors2.kt +++ b/idea/idea-completion/testData/smartMultiFile/GenericInheritors2/GenericInheritors2.kt @@ -4,5 +4,5 @@ fun foo(): KotlinTrait { return } -// EXIST: { lookupString: "object", itemText: "object: KotlinTrait{...}" } +// EXIST: { lookupString: "object", itemText: "object : KotlinTrait{...}" } // EXIST: { lookupString: "KotlinInheritor", itemText: "KotlinInheritor", tailText: "() (p)" } diff --git a/idea/idea-completion/testData/smartMultiFile/GenericInheritors3/GenericInheritors3.kt b/idea/idea-completion/testData/smartMultiFile/GenericInheritors3/GenericInheritors3.kt index f0712e996b0..6b2e75c5d6f 100644 --- a/idea/idea-completion/testData/smartMultiFile/GenericInheritors3/GenericInheritors3.kt +++ b/idea/idea-completion/testData/smartMultiFile/GenericInheritors3/GenericInheritors3.kt @@ -4,5 +4,5 @@ fun foo(): KotlinTrait { return } -// EXIST: { lookupString: "object", itemText: "object: KotlinTrait{...}" } +// EXIST: { lookupString: "object", itemText: "object : KotlinTrait{...}" } // ABSENT: KotlinInheritor diff --git a/idea/idea-completion/testData/smartMultiFile/GenericInheritors4/GenericInheritors4.kt b/idea/idea-completion/testData/smartMultiFile/GenericInheritors4/GenericInheritors4.kt index 69b80cc1f32..16adf1839a9 100644 --- a/idea/idea-completion/testData/smartMultiFile/GenericInheritors4/GenericInheritors4.kt +++ b/idea/idea-completion/testData/smartMultiFile/GenericInheritors4/GenericInheritors4.kt @@ -4,5 +4,5 @@ fun foo(): KotlinTrait> { return } -// EXIST: { lookupString: "object", itemText: "object: KotlinTrait>{...}" } +// EXIST: { lookupString: "object", itemText: "object : KotlinTrait>{...}" } // EXIST: { lookupString: "KotlinInheritor", itemText: "KotlinInheritor", tailText: "() (p)" } diff --git a/idea/idea-completion/testData/smartMultiFile/Inheritors/Inheritors.kt b/idea/idea-completion/testData/smartMultiFile/Inheritors/Inheritors.kt index fa6053029e7..b876f06b627 100644 --- a/idea/idea-completion/testData/smartMultiFile/Inheritors/Inheritors.kt +++ b/idea/idea-completion/testData/smartMultiFile/Inheritors/Inheritors.kt @@ -4,12 +4,12 @@ fun foo(): p2.KotlinTrait { return } -// EXIST: { lookupString: "object", itemText: "object: KotlinTrait{...}" } +// EXIST: { lookupString: "object", itemText: "object : KotlinTrait{...}" } // EXIST: { lookupString: "KotlinInheritor1", itemText: "KotlinInheritor1", tailText: "() (p2)" } // EXIST: { lookupString: "KotlinInheritor2", itemText: "KotlinInheritor2", tailText: "(s: String) (p2)" } -// EXIST: { lookupString: "object", itemText: "object: KotlinInheritor3(){...}" } +// EXIST: { lookupString: "object", itemText: "object : KotlinInheritor3(){...}" } // ABSENT: PrivateInheritor -// EXIST: { lookupString: "object", itemText: "object: JavaInheritor1(){...}" } +// EXIST: { lookupString: "object", itemText: "object : JavaInheritor1(){...}" } // EXIST: { lookupString: "JavaInheritor2", itemText: "JavaInheritor2", tailText: "(...) ()" } // ABSENT: JavaInheritor3 // EXIST: { lookupString: "ObjectInheritor", itemText: "ObjectInheritor", tailText: " (p2)" } diff --git a/idea/idea-completion/testData/smartMultiFile/InheritorsAndMultipleExpectedTypes/InheritorsAndMultipleExpectedTypes.kt b/idea/idea-completion/testData/smartMultiFile/InheritorsAndMultipleExpectedTypes/InheritorsAndMultipleExpectedTypes.kt index 1dbbbc7345e..fe0c5bdc2c7 100644 --- a/idea/idea-completion/testData/smartMultiFile/InheritorsAndMultipleExpectedTypes/InheritorsAndMultipleExpectedTypes.kt +++ b/idea/idea-completion/testData/smartMultiFile/InheritorsAndMultipleExpectedTypes/InheritorsAndMultipleExpectedTypes.kt @@ -2,9 +2,9 @@ fun bar() { foo() } -// EXIST: { lookupString: "object", itemText: "object: T1{...}" } -// EXIST: { lookupString: "object", itemText: "object: T2{...}" } -// EXIST: { lookupString: "object", itemText: "object: T3{...}" } +// EXIST: { lookupString: "object", itemText: "object : T1{...}" } +// EXIST: { lookupString: "object", itemText: "object : T2{...}" } +// EXIST: { lookupString: "object", itemText: "object : T3{...}" } // EXIST: { lookupString: "C1", itemText: "C1" } // EXIST: { lookupString: "C2", itemText: "C2" } // EXIST: { lookupString: "C3", itemText: "C3" } diff --git a/idea/idea-completion/testData/smartMultiFile/NoObjectDuplication/NoObjectDuplication.kt b/idea/idea-completion/testData/smartMultiFile/NoObjectDuplication/NoObjectDuplication.kt index aaab7eaad35..38fb0ba70ac 100644 --- a/idea/idea-completion/testData/smartMultiFile/NoObjectDuplication/NoObjectDuplication.kt +++ b/idea/idea-completion/testData/smartMultiFile/NoObjectDuplication/NoObjectDuplication.kt @@ -1,6 +1,6 @@ fun foo(): T = // EXIST: foo -// EXIST: { lookupString: "object", itemText: "object: T{...}" } +// EXIST: { lookupString: "object", itemText: "object : T{...}" } // EXIST: { lookupString: "OO", itemText: "OO", tailText: " ()" } // NOTHING_ELSE