diff --git a/idea/idea-completion/testData/smart/BooleanArgumentExpected.kt b/idea/idea-completion/testData/smart/BooleanArgumentExpected.kt index effc0e33f58..20375616067 100644 --- a/idea/idea-completion/testData/smart/BooleanArgumentExpected.kt +++ b/idea/idea-completion/testData/smart/BooleanArgumentExpected.kt @@ -10,8 +10,10 @@ fun bar() { // EXIST: { lookupString: "flag = true", itemText: "flag = true", attributes: "" } // EXIST: { lookupString: "flag = false", itemText: "flag = false", attributes: "" } // EXIST: { lookupString: "maxOf", tailText:"(a: Boolean, b: Boolean) (kotlin.comparisons)", typeText:"Boolean"} +// EXIST: { lookupString: "maxOf", tailText:"(a: Boolean, vararg other: Boolean) (kotlin.comparisons)", typeText:"Boolean"} // EXIST: { lookupString: "maxOf", tailText:"(a: Boolean, b: Boolean, c: Boolean) (kotlin.comparisons)", typeText:"Boolean"} // EXIST: { lookupString: "minOf", tailText:"(a: Boolean, b: Boolean) (kotlin.comparisons)","typeText":"Boolean"} +// EXIST: { lookupString: "minOf", tailText:"(a: Boolean, vararg other: Boolean) (kotlin.comparisons)","typeText":"Boolean"} // EXIST: { lookupString: "minOf", tailText:"(a: Boolean, b: Boolean, c: Boolean) (kotlin.comparisons)", typeText:"Boolean"} // EXIST: {"lookupString":"equals","tailText":"(other: Any?) (kotlin)","typeText":"Boolean"} // NOTHING_ELSE diff --git a/idea/idea-completion/testData/smart/EnumExpected.kt b/idea/idea-completion/testData/smart/EnumExpected.kt index 7a336735870..85af52c9239 100644 --- a/idea/idea-completion/testData/smart/EnumExpected.kt +++ b/idea/idea-completion/testData/smart/EnumExpected.kt @@ -13,8 +13,10 @@ fun foo(){ // EXIST: { lookupString:"Y", itemText:"Foo.Y", tailText:" (sample)", typeText:"Foo" } // EXIST: {"lookupString":"enumValueOf","tailText":"(name: String) (kotlin)","typeText":"Foo","attributes":"","allLookupStrings":"enumValueOf","itemText":"enumValueOf"} // EXIST: {"lookupString":"maxOf","tailText":"(a: Foo, b: Foo) (kotlin.comparisons)","typeText":"Foo","attributes":"","allLookupStrings":"maxOf","itemText":"maxOf"} +// EXIST: {"lookupString":"maxOf","tailText":"(a: Foo, vararg other: Foo) (kotlin.comparisons)","typeText":"Foo","attributes":"","allLookupStrings":"maxOf","itemText":"maxOf"} // EXIST: {"lookupString":"maxOf","tailText":"(a: Foo, b: Foo, c: Foo) (kotlin.comparisons)","typeText":"Foo","attributes":"","allLookupStrings":"maxOf","itemText":"maxOf"} // EXIST: {"lookupString":"minOf","tailText":"(a: Foo, b: Foo) (kotlin.comparisons)","typeText":"Foo","attributes":"","allLookupStrings":"minOf","itemText":"minOf"} +// EXIST: {"lookupString":"minOf","tailText":"(a: Foo, vararg other: Foo) (kotlin.comparisons)","typeText":"Foo","attributes":"","allLookupStrings":"minOf","itemText":"minOf"} // EXIST: {"lookupString":"minOf","tailText":"(a: Foo, b: Foo, c: Foo) (kotlin.comparisons)","typeText":"Foo","attributes":"","allLookupStrings":"minOf","itemText":"minOf"} // EXIST: {"lookupString":"valueOf","tailText":"(value: String) (sample)","typeText":"Foo","module":"light_idea_test_case","attributes":"","allLookupStrings":"Foo, valueOf","itemText":"Foo.valueOf"} diff --git a/idea/idea-completion/testData/smart/inheritors/GenericClass2.kt b/idea/idea-completion/testData/smart/inheritors/GenericClass2.kt index 44050a57f17..7adde3ac71f 100644 --- a/idea/idea-completion/testData/smart/inheritors/GenericClass2.kt +++ b/idea/idea-completion/testData/smart/inheritors/GenericClass2.kt @@ -18,7 +18,9 @@ fun bar() { // all these items shouldn't be proposed, see KT-15479 // EXIST: { itemText: "enumValueOf" } // EXIST: { itemText: "maxOf", tailText: "(a: T, b: T) (kotlin.comparisons)" } +// EXIST: { itemText: "maxOf", tailText: "(a: T, vararg other: T) (kotlin.comparisons)" } // EXIST: { itemText: "maxOf", tailText: "(a: T, b: T, c: T) (kotlin.comparisons)" } // EXIST: { itemText: "minOf", tailText: "(a: T, b: T) (kotlin.comparisons)" } +// EXIST: { itemText: "minOf", tailText: "(a: T, vararg other: T) (kotlin.comparisons)" } // EXIST: { itemText: "minOf", tailText: "(a: T, b: T, c: T) (kotlin.comparisons)" } // NOTHING_ELSE diff --git a/idea/idea-completion/testData/smart/inheritors/GenericClass3.kt b/idea/idea-completion/testData/smart/inheritors/GenericClass3.kt index ae8aef8864e..960ac1e1126 100644 --- a/idea/idea-completion/testData/smart/inheritors/GenericClass3.kt +++ b/idea/idea-completion/testData/smart/inheritors/GenericClass3.kt @@ -19,7 +19,9 @@ fun bar() { // all these items shouldn't be proposed, see KT-15479 // EXIST: { itemText: "enumValueOf" } // EXIST: { itemText: "maxOf", tailText: "(a: T, b: T) (kotlin.comparisons)" } +// EXIST: { itemText: "maxOf", tailText: "(a: T, vararg other: T) (kotlin.comparisons)" } // EXIST: { itemText: "maxOf", tailText: "(a: T, b: T, c: T) (kotlin.comparisons)" } // EXIST: { itemText: "minOf", tailText: "(a: T, b: T) (kotlin.comparisons)" } +// EXIST: { itemText: "minOf", tailText: "(a: T, vararg other: T) (kotlin.comparisons)" } // EXIST: { itemText: "minOf", tailText: "(a: T, b: T, c: T) (kotlin.comparisons)" } // NOTHING_ELSE diff --git a/idea/idea-completion/testData/smart/inheritors/GenericClass4.kt b/idea/idea-completion/testData/smart/inheritors/GenericClass4.kt index 19313afa6f4..adb67edfc0a 100644 --- a/idea/idea-completion/testData/smart/inheritors/GenericClass4.kt +++ b/idea/idea-completion/testData/smart/inheritors/GenericClass4.kt @@ -14,7 +14,9 @@ fun bar() { // all these items shouldn't be proposed, see KT-15479 // EXIST: { itemText: "enumValueOf" } // EXIST: { itemText: "maxOf", tailText: "(a: T, b: T) (kotlin.comparisons)" } +// EXIST: { itemText: "maxOf", tailText: "(a: T, vararg other: T) (kotlin.comparisons)" } // EXIST: { itemText: "maxOf", tailText: "(a: T, b: T, c: T) (kotlin.comparisons)" } // EXIST: { itemText: "minOf", tailText: "(a: T, b: T) (kotlin.comparisons)" } +// EXIST: { itemText: "minOf", tailText: "(a: T, vararg other: T) (kotlin.comparisons)" } // EXIST: { itemText: "minOf", tailText: "(a: T, b: T, c: T) (kotlin.comparisons)" } // NOTHING_ELSE diff --git a/idea/idea-completion/testData/smart/inheritors/GenericClass6.kt b/idea/idea-completion/testData/smart/inheritors/GenericClass6.kt index 9dd034249d5..8f5bcee00ff 100644 --- a/idea/idea-completion/testData/smart/inheritors/GenericClass6.kt +++ b/idea/idea-completion/testData/smart/inheritors/GenericClass6.kt @@ -21,7 +21,9 @@ fun bar() { // all these items shouldn't be proposed, see KT-15479 // EXIST: { itemText: "enumValueOf" } // EXIST: { itemText: "maxOf", tailText: "(a: T, b: T) (kotlin.comparisons)" } +// EXIST: { itemText: "maxOf", tailText: "(a: T, vararg other: T) (kotlin.comparisons)" } // EXIST: { itemText: "maxOf", tailText: "(a: T, b: T, c: T) (kotlin.comparisons)" } // EXIST: { itemText: "minOf", tailText: "(a: T, b: T) (kotlin.comparisons)" } +// EXIST: { itemText: "minOf", tailText: "(a: T, vararg other: T) (kotlin.comparisons)" } // EXIST: { itemText: "minOf", tailText: "(a: T, b: T, c: T) (kotlin.comparisons)" } // NOTHING_ELSE diff --git a/idea/idea-completion/testData/weighers/smart/BooleanExpected.kt b/idea/idea-completion/testData/weighers/smart/BooleanExpected.kt index 6baf8c9b15c..b58c10ee525 100644 --- a/idea/idea-completion/testData/weighers/smart/BooleanExpected.kt +++ b/idea/idea-completion/testData/weighers/smart/BooleanExpected.kt @@ -20,6 +20,8 @@ fun foo(pFoo: Boolean, s: String) { // ORDER: nonNullable // ORDER: maxOf // ORDER: maxOf +// ORDER: maxOf +// ORDER: minOf // ORDER: minOf // ORDER: minOf // ORDER: nullableX