From 67486b867b1543bcaa97046477fe601f8d17aaed Mon Sep 17 00:00:00 2001
From: Denis Zharkov <denis.zharkov@jetbrains.com>
Date: Wed, 23 Sep 2015 12:17:07 +0300
Subject: [PATCH] Get rid of `inlineOptions` usages in IDE tests

---
 .../basic/common/NoParameterAnnotationInPresentation.kt   | 2 +-
 .../basic/common/annotations/FunctionAnnotation1.kt       | 2 +-
 .../basic/common/annotations/FunctionAnnotation2.kt       | 2 +-
 .../basic/common/annotations/ParameterAnnotation1.kt      | 2 +-
 .../basic/common/annotations/ParameterAnnotation2.kt      | 8 ++++----
 .../basic/common/annotations/ParameterAnnotation3.kt      | 2 +-
 .../basic/common/annotations/ParameterAnnotation4.kt      | 4 ++--
 .../basic/common/annotations/ParameterAnnotation5.kt      | 2 +-
 .../basic/common/annotations/ParameterAnnotation6.kt      | 8 +++++++-
 .../basic/common/annotations/ParameterAnnotation7.kt      | 2 +-
 .../basic/common/annotations/ParameterAnnotation8.kt      | 2 +-
 .../basic/common/annotations/ParameterAnnotation9.kt      | 8 ++++----
 .../basic/common/annotations/ParameterAnnotationArgs.kt   | 8 +++++++-
 .../common/annotations/ParameterAnnotationAutoPopup1.kt   | 4 ++--
 .../common/annotations/ParameterAnnotationAutoPopup2.kt   | 4 ++--
 .../basic/common/annotations/TopLevelAnnotation1.kt       | 2 +-
 .../basic/common/annotations/TopLevelAnnotation2.kt       | 2 +-
 .../basic/common/annotations/TopLevelAnnotation3.kt       | 2 +-
 .../basic/common/annotations/TopLevelAnnotation4.kt       | 2 +-
 .../parameterInfo/functionParameterInfo/NoAnnotations.kt  | 2 +-
 20 files changed, 41 insertions(+), 29 deletions(-)

diff --git a/idea/idea-completion/testData/basic/common/NoParameterAnnotationInPresentation.kt b/idea/idea-completion/testData/basic/common/NoParameterAnnotationInPresentation.kt
index e8798d00373..ed3ec7bd5b0 100644
--- a/idea/idea-completion/testData/basic/common/NoParameterAnnotationInPresentation.kt
+++ b/idea/idea-completion/testData/basic/common/NoParameterAnnotationInPresentation.kt
@@ -1,4 +1,4 @@
-fun foo(inlineOptions p: () -> Unit){}
+fun foo(@Suppress("UNCHECKED_CAST") p: () -> Unit){}
 
 fun bar() {
     <caret>
diff --git a/idea/idea-completion/testData/basic/common/annotations/FunctionAnnotation1.kt b/idea/idea-completion/testData/basic/common/annotations/FunctionAnnotation1.kt
index 82ad91356f6..ab522384ebf 100644
--- a/idea/idea-completion/testData/basic/common/annotations/FunctionAnnotation1.kt
+++ b/idea/idea-completion/testData/basic/common/annotations/FunctionAnnotation1.kt
@@ -6,6 +6,6 @@ fun some() {}
 
 // INVOCATION_COUNT: 0
 // EXIST: Hello
-// EXIST: inlineOptions
+// EXIST: Suppress
 // ABSENT: String
 // ABSENT: v
diff --git a/idea/idea-completion/testData/basic/common/annotations/FunctionAnnotation2.kt b/idea/idea-completion/testData/basic/common/annotations/FunctionAnnotation2.kt
index ffa7b6b9912..cce9d4fc4bb 100644
--- a/idea/idea-completion/testData/basic/common/annotations/FunctionAnnotation2.kt
+++ b/idea/idea-completion/testData/basic/common/annotations/FunctionAnnotation2.kt
@@ -5,6 +5,6 @@ val v = 1
 
 // INVOCATION_COUNT: 0
 // EXIST: Hello
-// EXIST: inlineOptions
+// EXIST: Suppress
 // ABSENT: String
 // ABSENT: v
diff --git a/idea/idea-completion/testData/basic/common/annotations/ParameterAnnotation1.kt b/idea/idea-completion/testData/basic/common/annotations/ParameterAnnotation1.kt
index 9f7c3307060..c25f17fe0a6 100644
--- a/idea/idea-completion/testData/basic/common/annotations/ParameterAnnotation1.kt
+++ b/idea/idea-completion/testData/basic/common/annotations/ParameterAnnotation1.kt
@@ -5,6 +5,6 @@ fun foo(<caret>) { }
 
 // INVOCATION_COUNT: 1
 // EXIST: Hello
-// EXIST: inlineOptions
+// EXIST: Suppress
 // ABSENT: String
 // ABSENT: v
diff --git a/idea/idea-completion/testData/basic/common/annotations/ParameterAnnotation2.kt b/idea/idea-completion/testData/basic/common/annotations/ParameterAnnotation2.kt
index 7b81e7d3ea1..aba251d6a55 100644
--- a/idea/idea-completion/testData/basic/common/annotations/ParameterAnnotation2.kt
+++ b/idea/idea-completion/testData/basic/common/annotations/ParameterAnnotation2.kt
@@ -1,7 +1,7 @@
-annotation class iHello
+annotation class SHello
 
-fun foo(i<caret>) { }
+fun foo(S<caret>) { }
 
 // INVOCATION_COUNT: 1
-// EXIST: iHello
-// EXIST: inlineOptions
+// EXIST: SHello
+// EXIST: Suppress
\ No newline at end of file
diff --git a/idea/idea-completion/testData/basic/common/annotations/ParameterAnnotation3.kt b/idea/idea-completion/testData/basic/common/annotations/ParameterAnnotation3.kt
index 22dd7cd1829..ef38e4ba7c4 100644
--- a/idea/idea-completion/testData/basic/common/annotations/ParameterAnnotation3.kt
+++ b/idea/idea-completion/testData/basic/common/annotations/ParameterAnnotation3.kt
@@ -5,6 +5,6 @@ fun foo(p: String, <caret>) { }
 
 // INVOCATION_COUNT: 1
 // EXIST: Hello
-// EXIST: inlineOptions
+// EXIST: Suppress
 // ABSENT: String
 // ABSENT: v
diff --git a/idea/idea-completion/testData/basic/common/annotations/ParameterAnnotation4.kt b/idea/idea-completion/testData/basic/common/annotations/ParameterAnnotation4.kt
index e49c8f90aaa..eb8f3307da9 100644
--- a/idea/idea-completion/testData/basic/common/annotations/ParameterAnnotation4.kt
+++ b/idea/idea-completion/testData/basic/common/annotations/ParameterAnnotation4.kt
@@ -1,10 +1,10 @@
 annotation class Hello
 val v = 1
 
-fun foo(volatile <caret>) { }
+fun foo(@Volatile <caret>) { }
 
 // INVOCATION_COUNT: 1
 // EXIST: Hello
-// EXIST: inlineOptions
+// EXIST: Suppress
 // ABSENT: String
 // ABSENT: v
diff --git a/idea/idea-completion/testData/basic/common/annotations/ParameterAnnotation5.kt b/idea/idea-completion/testData/basic/common/annotations/ParameterAnnotation5.kt
index 0f5c30c94e6..2dbc7f7ee01 100644
--- a/idea/idea-completion/testData/basic/common/annotations/ParameterAnnotation5.kt
+++ b/idea/idea-completion/testData/basic/common/annotations/ParameterAnnotation5.kt
@@ -5,6 +5,6 @@ fun foo(<caret>
 
 // INVOCATION_COUNT: 1
 // EXIST: Hello
-// EXIST: inlineOptions
+// EXIST: Suppress
 // ABSENT: String
 // ABSENT: v
diff --git a/idea/idea-completion/testData/basic/common/annotations/ParameterAnnotation6.kt b/idea/idea-completion/testData/basic/common/annotations/ParameterAnnotation6.kt
index 8475e4dee53..0832aa3d159 100644
--- a/idea/idea-completion/testData/basic/common/annotations/ParameterAnnotation6.kt
+++ b/idea/idea-completion/testData/basic/common/annotations/ParameterAnnotation6.kt
@@ -1,6 +1,12 @@
 val v = 1
 
-fun foo(inlineOptions(InlineOp<caret>) a: Int) { }
+enum class class InlineOption {
+    A, B
+}
+
+annotation class inlineOptions(val x: InlineOption)
+
+fun foo(@inlineOptions(InlineOp<caret>) a: Int) { }
 
 // INVOCATION_COUNT: 1
 // EXIST: InlineOption
diff --git a/idea/idea-completion/testData/basic/common/annotations/ParameterAnnotation7.kt b/idea/idea-completion/testData/basic/common/annotations/ParameterAnnotation7.kt
index 871f085ab09..e543c4137de 100644
--- a/idea/idea-completion/testData/basic/common/annotations/ParameterAnnotation7.kt
+++ b/idea/idea-completion/testData/basic/common/annotations/ParameterAnnotation7.kt
@@ -1,5 +1,5 @@
 fun foo(kotlin.<caret>) { }
 
 // INVOCATION_COUNT: 1
-// EXIST: inlineOptions
+// EXIST: Suppress
 // ABSENT: String
diff --git a/idea/idea-completion/testData/basic/common/annotations/ParameterAnnotation8.kt b/idea/idea-completion/testData/basic/common/annotations/ParameterAnnotation8.kt
index cb84d6d403c..84e76d3bc6f 100644
--- a/idea/idea-completion/testData/basic/common/annotations/ParameterAnnotation8.kt
+++ b/idea/idea-completion/testData/basic/common/annotations/ParameterAnnotation8.kt
@@ -5,6 +5,6 @@ fun foo(@[<caret>) { }
 
 // INVOCATION_COUNT: 1
 // EXIST: Hello
-// EXIST: inlineOptions
+// EXIST: Suppress
 // ABSENT: String
 // ABSENT: v
diff --git a/idea/idea-completion/testData/basic/common/annotations/ParameterAnnotation9.kt b/idea/idea-completion/testData/basic/common/annotations/ParameterAnnotation9.kt
index 7d306d6ef8d..6592dc4b96d 100644
--- a/idea/idea-completion/testData/basic/common/annotations/ParameterAnnotation9.kt
+++ b/idea/idea-completion/testData/basic/common/annotations/ParameterAnnotation9.kt
@@ -1,10 +1,10 @@
-annotation class iHello
+annotation class SHello
 val v = 1
 
-fun foo(@[i<caret>) { }
+fun foo(@[S<caret>) { }
 
 // INVOCATION_COUNT: 1
-// EXIST: iHello
-// EXIST: inlineOptions
+// EXIST: SHello
+// EXIST: Suppress
 // ABSENT: String
 // ABSENT: v
diff --git a/idea/idea-completion/testData/basic/common/annotations/ParameterAnnotationArgs.kt b/idea/idea-completion/testData/basic/common/annotations/ParameterAnnotationArgs.kt
index f3b6bbb8826..862764e58f4 100644
--- a/idea/idea-completion/testData/basic/common/annotations/ParameterAnnotationArgs.kt
+++ b/idea/idea-completion/testData/basic/common/annotations/ParameterAnnotationArgs.kt
@@ -1,6 +1,12 @@
 val v = 1
 
-fun foo(inlineOptions(<caret>) { }
+enum class class InlineOption {
+    A, B
+}
+
+annotation class inlineOptions(val x: InlineOption)
+
+fun foo(@inlineOptions(<caret>) { }
 
 // INVOCATION_COUNT: 1
 // EXIST: InlineOption
diff --git a/idea/idea-completion/testData/basic/common/annotations/ParameterAnnotationAutoPopup1.kt b/idea/idea-completion/testData/basic/common/annotations/ParameterAnnotationAutoPopup1.kt
index ebe1604f908..1eceaee0fd5 100644
--- a/idea/idea-completion/testData/basic/common/annotations/ParameterAnnotationAutoPopup1.kt
+++ b/idea/idea-completion/testData/basic/common/annotations/ParameterAnnotationAutoPopup1.kt
@@ -1,8 +1,8 @@
 val v = 1
 
-fun foo(@[i<caret>) { }
+fun foo(@[S<caret>) { }
 
 // INVOCATION_COUNT: 0
-// EXIST: inlineOptions
+// EXIST: Suppress
 // ABSENT: String
 // ABSENT: v
diff --git a/idea/idea-completion/testData/basic/common/annotations/ParameterAnnotationAutoPopup2.kt b/idea/idea-completion/testData/basic/common/annotations/ParameterAnnotationAutoPopup2.kt
index 4cff55de9f1..62675f058d3 100644
--- a/idea/idea-completion/testData/basic/common/annotations/ParameterAnnotationAutoPopup2.kt
+++ b/idea/idea-completion/testData/basic/common/annotations/ParameterAnnotationAutoPopup2.kt
@@ -1,8 +1,8 @@
 val v = 1
 
-fun foo(@[volatile i<caret>) { }
+fun foo(@[volatile S<caret>) { }
 
 // INVOCATION_COUNT: 0
-// EXIST: inlineOptions
+// EXIST: Suppress
 // ABSENT: String
 // ABSENT: v
diff --git a/idea/idea-completion/testData/basic/common/annotations/TopLevelAnnotation1.kt b/idea/idea-completion/testData/basic/common/annotations/TopLevelAnnotation1.kt
index 813017f2026..fe8cb83b506 100644
--- a/idea/idea-completion/testData/basic/common/annotations/TopLevelAnnotation1.kt
+++ b/idea/idea-completion/testData/basic/common/annotations/TopLevelAnnotation1.kt
@@ -5,6 +5,6 @@ val v = 1
 
 // INVOCATION_COUNT: 0
 // EXIST: Hello
-// EXIST: inlineOptions
+// EXIST: Suppress
 // ABSENT: String
 // ABSENT: v
diff --git a/idea/idea-completion/testData/basic/common/annotations/TopLevelAnnotation2.kt b/idea/idea-completion/testData/basic/common/annotations/TopLevelAnnotation2.kt
index 12bf0129685..bd906fc3d61 100644
--- a/idea/idea-completion/testData/basic/common/annotations/TopLevelAnnotation2.kt
+++ b/idea/idea-completion/testData/basic/common/annotations/TopLevelAnnotation2.kt
@@ -5,6 +5,6 @@ val v = 1
 
 // INVOCATION_COUNT: 0
 // EXIST: Hello
-// EXIST: inlineOptions
+// EXIST: Suppress
 // ABSENT: String
 // ABSENT: v
diff --git a/idea/idea-completion/testData/basic/common/annotations/TopLevelAnnotation3.kt b/idea/idea-completion/testData/basic/common/annotations/TopLevelAnnotation3.kt
index d476c3f67b3..74bf3878c24 100644
--- a/idea/idea-completion/testData/basic/common/annotations/TopLevelAnnotation3.kt
+++ b/idea/idea-completion/testData/basic/common/annotations/TopLevelAnnotation3.kt
@@ -6,6 +6,6 @@ class C
 
 // INVOCATION_COUNT: 0
 // EXIST: Hello
-// EXIST: inlineOptions
+// EXIST: Suppress
 // ABSENT: String
 // ABSENT: v
diff --git a/idea/idea-completion/testData/basic/common/annotations/TopLevelAnnotation4.kt b/idea/idea-completion/testData/basic/common/annotations/TopLevelAnnotation4.kt
index d202f78c302..c3aabcab23b 100644
--- a/idea/idea-completion/testData/basic/common/annotations/TopLevelAnnotation4.kt
+++ b/idea/idea-completion/testData/basic/common/annotations/TopLevelAnnotation4.kt
@@ -6,6 +6,6 @@ class C
 
 // INVOCATION_COUNT: 0
 // EXIST: Hello
-// EXIST: inlineOptions
+// EXIST: Suppress
 // ABSENT: String
 // ABSENT: v
diff --git a/idea/testData/parameterInfo/functionParameterInfo/NoAnnotations.kt b/idea/testData/parameterInfo/functionParameterInfo/NoAnnotations.kt
index 932921080a8..d8b6f8a32f1 100644
--- a/idea/testData/parameterInfo/functionParameterInfo/NoAnnotations.kt
+++ b/idea/testData/parameterInfo/functionParameterInfo/NoAnnotations.kt
@@ -1,4 +1,4 @@
-fun foo(inlineOptions p: () -> Unit){}
+fun foo(@Suppress("UNCHECKED_CAST") p: () -> Unit){}
 
 fun bar() {
     foo(<caret>)