From 8f38d03b48bb0195827ddda60c80d4e0c894ae7b Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Tue, 16 May 2017 15:26:52 +0200
Subject: [PATCH] Indicate vararg parameters in Goto Symbol presentation

 #KT-17899 Fixed
---
 .../kotlin/idea/presentation/DeclarationPresenters.kt         | 4 +++-
 idea/testData/navigation/gotoSymbol/stdLibArrayListOf.kt      | 2 +-
 .../navigation/gotoSymbol/stdLibArrayListOfNoSources.kt       | 2 +-
 idea/testData/resolve/references/CtrlClickResolve.kt          | 2 +-
 idea/testData/resolve/references/invoke/lambdaAndParens.kt    | 2 +-
 idea/testData/resolve/references/invoke/lambdaNoPar.kt        | 2 +-
 idea/testData/resolve/references/invoke/lambdaNoParLabel.kt   | 2 +-
 idea/testData/resolve/references/invoke/lambdaNoParRCurly.kt  | 2 +-
 idea/testData/resolve/references/invoke/noParams.kt           | 2 +-
 idea/testData/resolve/references/invoke/noParamsRPar.kt       | 2 +-
 idea/testData/resolve/references/invoke/nonemptyLambdaRPar.kt | 2 +-
 idea/testData/resolve/references/invoke/oneParam.kt           | 2 +-
 idea/testData/resolve/references/invoke/oneParamRPar.kt       | 2 +-
 idea/testData/script/definition/navigation/stdlib/script.kts  | 2 +-
 .../script/definition/navigation/stdlibWithSources/script.kts | 2 +-
 idea/testData/stubs/AnnotationOnLocalFunction.kt              | 2 +-
 16 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/presentation/DeclarationPresenters.kt b/idea/src/org/jetbrains/kotlin/idea/presentation/DeclarationPresenters.kt
index 7a81f0ced3e..4785f833e88 100644
--- a/idea/src/org/jetbrains/kotlin/idea/presentation/DeclarationPresenters.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/presentation/DeclarationPresenters.kt
@@ -77,7 +77,9 @@ class KtFunctionPresenter : ItemPresentationProvider<KtFunction> {
                     function.name?.let { append(it) }
 
                     append("(")
-                    append(function.valueParameters.joinToString { it.typeReference?.text ?: "" })
+                    append(function.valueParameters.joinToString {
+                        (if (it.isVarArg) "vararg " else "") + (it.typeReference?.text ?: "")
+                    })
                     append(")")
                 }
             }
diff --git a/idea/testData/navigation/gotoSymbol/stdLibArrayListOf.kt b/idea/testData/navigation/gotoSymbol/stdLibArrayListOf.kt
index 15d0becadd2..91a58eda2f7 100644
--- a/idea/testData/navigation/gotoSymbol/stdLibArrayListOf.kt
+++ b/idea/testData/navigation/gotoSymbol/stdLibArrayListOf.kt
@@ -2,4 +2,4 @@
 // CHECK_BOX
 // SEARCH_TEXT: arrayListOf
 // REF: (kotlin.collections).arrayListOf()
-// REF: (kotlin.collections).arrayListOf(T)
+// REF: (kotlin.collections).arrayListOf(vararg T)
diff --git a/idea/testData/navigation/gotoSymbol/stdLibArrayListOfNoSources.kt b/idea/testData/navigation/gotoSymbol/stdLibArrayListOfNoSources.kt
index cdd39bf7616..b0570848fbf 100644
--- a/idea/testData/navigation/gotoSymbol/stdLibArrayListOfNoSources.kt
+++ b/idea/testData/navigation/gotoSymbol/stdLibArrayListOfNoSources.kt
@@ -2,4 +2,4 @@
 // CHECK_BOX
 // SEARCH_TEXT: arrayListOf
 // REF: (kotlin.collections).arrayListOf()
-// REF: (kotlin.collections).arrayListOf(T)
+// REF: (kotlin.collections).arrayListOf(vararg T)
diff --git a/idea/testData/resolve/references/CtrlClickResolve.kt b/idea/testData/resolve/references/CtrlClickResolve.kt
index 9157fd9ed13..b621cd03264 100644
--- a/idea/testData/resolve/references/CtrlClickResolve.kt
+++ b/idea/testData/resolve/references/CtrlClickResolve.kt
@@ -7,4 +7,4 @@ fun main(args : Array<String>) {
     var a = <caret>IntArray(array(1, 2, 3))
 }
 
-// REF: (ctrl_click).IntArray(Int)
+// REF: (ctrl_click).IntArray(vararg Int)
diff --git a/idea/testData/resolve/references/invoke/lambdaAndParens.kt b/idea/testData/resolve/references/invoke/lambdaAndParens.kt
index e9b40b79f96..a23abb74304 100644
--- a/idea/testData/resolve/references/invoke/lambdaAndParens.kt
+++ b/idea/testData/resolve/references/invoke/lambdaAndParens.kt
@@ -6,4 +6,4 @@ fun test(f: Foo) {
   f() <caret>{}
 }
 
-// REF: (in Foo).invoke(Any)
\ No newline at end of file
+// REF: (in Foo).invoke(vararg Any)
\ No newline at end of file
diff --git a/idea/testData/resolve/references/invoke/lambdaNoPar.kt b/idea/testData/resolve/references/invoke/lambdaNoPar.kt
index a276b5eaff2..cd6e79d71c2 100644
--- a/idea/testData/resolve/references/invoke/lambdaNoPar.kt
+++ b/idea/testData/resolve/references/invoke/lambdaNoPar.kt
@@ -6,4 +6,4 @@ fun test(f: Foo) {
   f <caret>{}
 }
 
-// REF: (in Foo).invoke(Any)
\ No newline at end of file
+// REF: (in Foo).invoke(vararg Any)
\ No newline at end of file
diff --git a/idea/testData/resolve/references/invoke/lambdaNoParLabel.kt b/idea/testData/resolve/references/invoke/lambdaNoParLabel.kt
index 53c12bb9159..0ae77948e39 100644
--- a/idea/testData/resolve/references/invoke/lambdaNoParLabel.kt
+++ b/idea/testData/resolve/references/invoke/lambdaNoParLabel.kt
@@ -6,4 +6,4 @@ fun test(f: Foo) {
   f f@ <caret>{}
 }
 
-// REF: (in Foo).invoke(Any)
\ No newline at end of file
+// REF: (in Foo).invoke(vararg Any)
\ No newline at end of file
diff --git a/idea/testData/resolve/references/invoke/lambdaNoParRCurly.kt b/idea/testData/resolve/references/invoke/lambdaNoParRCurly.kt
index 3aef4c145aa..1dc808f0527 100644
--- a/idea/testData/resolve/references/invoke/lambdaNoParRCurly.kt
+++ b/idea/testData/resolve/references/invoke/lambdaNoParRCurly.kt
@@ -6,4 +6,4 @@ fun test(f: Foo) {
   f {<caret>}
 }
 
-// REF: (in Foo).invoke(Any)
\ No newline at end of file
+// REF: (in Foo).invoke(vararg Any)
\ No newline at end of file
diff --git a/idea/testData/resolve/references/invoke/noParams.kt b/idea/testData/resolve/references/invoke/noParams.kt
index db6af4176ac..08bc847cc3f 100644
--- a/idea/testData/resolve/references/invoke/noParams.kt
+++ b/idea/testData/resolve/references/invoke/noParams.kt
@@ -6,4 +6,4 @@ fun test(f: Foo) {
   f<caret>()
 }
 
-// REF: (in Foo).invoke(Any)
\ No newline at end of file
+// REF: (in Foo).invoke(vararg Any)
\ No newline at end of file
diff --git a/idea/testData/resolve/references/invoke/noParamsRPar.kt b/idea/testData/resolve/references/invoke/noParamsRPar.kt
index 3838caf0604..b13b8abf576 100644
--- a/idea/testData/resolve/references/invoke/noParamsRPar.kt
+++ b/idea/testData/resolve/references/invoke/noParamsRPar.kt
@@ -6,4 +6,4 @@ fun test(f: Foo) {
   f(<caret>)
 }
 
-// REF: (in Foo).invoke(Any)
\ No newline at end of file
+// REF: (in Foo).invoke(vararg Any)
\ No newline at end of file
diff --git a/idea/testData/resolve/references/invoke/nonemptyLambdaRPar.kt b/idea/testData/resolve/references/invoke/nonemptyLambdaRPar.kt
index 5d10bb78c37..2ce67a054ed 100644
--- a/idea/testData/resolve/references/invoke/nonemptyLambdaRPar.kt
+++ b/idea/testData/resolve/references/invoke/nonemptyLambdaRPar.kt
@@ -6,4 +6,4 @@ fun test(f: Foo) {
   f() { 1<caret>}
 }
 
-// REF: (in Foo).invoke(Any)
\ No newline at end of file
+// REF: (in Foo).invoke(vararg Any)
\ No newline at end of file
diff --git a/idea/testData/resolve/references/invoke/oneParam.kt b/idea/testData/resolve/references/invoke/oneParam.kt
index 89b26c82d21..1b335b41689 100644
--- a/idea/testData/resolve/references/invoke/oneParam.kt
+++ b/idea/testData/resolve/references/invoke/oneParam.kt
@@ -6,4 +6,4 @@ fun test(f: Foo) {
   f<caret>(1)
 }
 
-// REF: (in Foo).invoke(Any)
\ No newline at end of file
+// REF: (in Foo).invoke(vararg Any)
\ No newline at end of file
diff --git a/idea/testData/resolve/references/invoke/oneParamRPar.kt b/idea/testData/resolve/references/invoke/oneParamRPar.kt
index 13c5c98c11a..dc2814b11bc 100644
--- a/idea/testData/resolve/references/invoke/oneParamRPar.kt
+++ b/idea/testData/resolve/references/invoke/oneParamRPar.kt
@@ -6,4 +6,4 @@ fun test(f: Foo) {
   f(1<caret>)
 }
 
-// REF: (in Foo).invoke(Any)
\ No newline at end of file
+// REF: (in Foo).invoke(vararg Any)
\ No newline at end of file
diff --git a/idea/testData/script/definition/navigation/stdlib/script.kts b/idea/testData/script/definition/navigation/stdlib/script.kts
index 9bde386bf9f..bb954d983c8 100644
--- a/idea/testData/script/definition/navigation/stdlib/script.kts
+++ b/idea/testData/script/definition/navigation/stdlib/script.kts
@@ -1,4 +1,4 @@
 val g = lis<caret>tOf("a", "b", "c")
 
-// REF: (kotlin.collections).listOf(T)
+// REF: (kotlin.collections).listOf(vararg T)
 // FILE: collections/CollectionsKt.class
\ No newline at end of file
diff --git a/idea/testData/script/definition/navigation/stdlibWithSources/script.kts b/idea/testData/script/definition/navigation/stdlibWithSources/script.kts
index 41b67953fab..53a3b8b5af3 100644
--- a/idea/testData/script/definition/navigation/stdlibWithSources/script.kts
+++ b/idea/testData/script/definition/navigation/stdlibWithSources/script.kts
@@ -1,4 +1,4 @@
 val g = lis<caret>tOf("a", "b", "c")
 
-// REF: (kotlin.collections).listOf(T)
+// REF: (kotlin.collections).listOf(vararg T)
 // FILE: collections/Collections.kt
\ No newline at end of file
diff --git a/idea/testData/stubs/AnnotationOnLocalFunction.kt b/idea/testData/stubs/AnnotationOnLocalFunction.kt
index 217ba4b339e..7e21bda79c7 100644
--- a/idea/testData/stubs/AnnotationOnLocalFunction.kt
+++ b/idea/testData/stubs/AnnotationOnLocalFunction.kt
@@ -1,4 +1,4 @@
 fun foo() {
-    @[Deprecated] fun innerFoo() {
+    @Deprecated fun innerFoo() {
     }
 }
\ No newline at end of file