From e393282c67913cfcd19df96657a0dd1fdde8382e Mon Sep 17 00:00:00 2001
From: Yan Zhulanow <yan.zhulanow@jetbrains.com>
Date: Thu, 18 Jan 2024 18:31:52 +0900
Subject: [PATCH] [Analysis API] Remove test infrastructure for obsolete on-air
 analysis

---
 .../psiType/asKtType/anonym.kt                |  2 +-
 .../psiType/asKtType/extends.kt               |  2 +-
 .../psiType/asKtType/methodTypeParameters.kt  |  2 +-
 .../psiType/asKtType/nestedGenerics.kt        |  2 +-
 .../psiType/asKtType/nullableString.kt        |  2 +-
 .../psiType/asKtType/primitive.kt             |  2 +-
 .../psiType/asKtType/typeParameters.kt        |  2 +-
 .../psiType/asKtType/typeParameters2.kt       |  2 +-
 .../multipleExtensions.kt                     |  2 +-
 .../extensionScopeWithPsi/singleModule.kt     |  2 +-
 .../importingScopeContext/errorImport.kt      |  2 +-
 .../importingScopeContext/importAlias.kt      |  2 +-
 .../importingScopeContext/noImports.kt        |  2 +-
 .../importingScopeContext/simpleImport.kt     |  2 +-
 .../importingScopeContext/starImport.kt       |  2 +-
 ...vaMethodWithMultipleTypeParametersBound.kt |  2 +-
 .../javaMethodWithTypeParametersBound.kt      |  2 +-
 .../base/AbstractAnalysisApiBasedTest.kt      | 19 -------------------
 18 files changed, 17 insertions(+), 36 deletions(-)

diff --git a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/anonym.kt b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/anonym.kt
index daae4bb7fc6..1387d31bbb9 100644
--- a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/anonym.kt
+++ b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/anonym.kt
@@ -1,5 +1,5 @@
 // FILE: B.kt
-class A<caret_onAirContext>K: A<String>() {
+class AK: A<String>() {
 }
 // FILE: A.java
 class A<T> {
diff --git a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/extends.kt b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/extends.kt
index 8f8dd6a1475..30ef3936120 100644
--- a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/extends.kt
+++ b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/extends.kt
@@ -1,6 +1,6 @@
 // FILE: B.kt
 interface B: A {
-    fun f<caret_onAirContext>oo(): java.util.List<String?>?
+    fun foo(): java.util.List<String?>?
 }
 // FILE: A.java
 public interface A {
diff --git a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/methodTypeParameters.kt b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/methodTypeParameters.kt
index 83d0dabbdd9..351a1f2f466 100644
--- a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/methodTypeParameters.kt
+++ b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/methodTypeParameters.kt
@@ -1,6 +1,6 @@
 // FILE: B.kt
 class B: A<String> {
-    override fun <K : String?> f<caret_onAirContext>oo(): K? {
+    override fun <K : String?> foo(): K? {
         TODO("Not yet implemented")
     }
 }
diff --git a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/nestedGenerics.kt b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/nestedGenerics.kt
index 23a59e700ac..ce6f8dc22ea 100644
--- a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/nestedGenerics.kt
+++ b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/nestedGenerics.kt
@@ -1,6 +1,6 @@
 // FILE: B.kt
 interface B: A {
-    fun fo<caret_onAirContext>o(): java.util.List<String?>?
+    fun foo(): java.util.List<String?>?
 }
 // FILE: A.java
 public interface A {
diff --git a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/nullableString.kt b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/nullableString.kt
index 5c6ca9ba5de..54602583eee 100644
--- a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/nullableString.kt
+++ b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/nullableString.kt
@@ -1,6 +1,6 @@
 // FILE: B.kt
 interface B: A {
-    fun f<caret_onAirContext>oo(): String?
+    fun foo(): String?
 }
 // FILE: A.java
 public interface A {
diff --git a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/primitive.kt b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/primitive.kt
index 391a70e1ef5..cf43ada3c02 100644
--- a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/primitive.kt
+++ b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/primitive.kt
@@ -1,6 +1,6 @@
 // FILE: B.kt
 interface B: A {
-    fun fo<caret_onAirContext>o(): Int
+    fun foo(): Int
 }
 // FILE: A.java
 public interface A {
diff --git a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/typeParameters.kt b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/typeParameters.kt
index ce245d58ca5..2b59c49241e 100644
--- a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/typeParameters.kt
+++ b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/typeParameters.kt
@@ -1,6 +1,6 @@
 // FILE: B.kt
 interface B: A<String> {
-    fun f<caret_onAirContext>oo(): String?
+    fun foo(): String?
 }
 // FILE: A.java
 public interface A<T> {
diff --git a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/typeParameters2.kt b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/typeParameters2.kt
index e520f9a719f..8dc074966c4 100644
--- a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/typeParameters2.kt
+++ b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/typeParameters2.kt
@@ -1,7 +1,7 @@
 // FILE: B.kt
 class AK: A<String>() {
     inner class BK: B<String>() {
-        override fun <K : String?> f<caret_onAirContext>oo(): K {
+        override fun <K : String?> foo(): K {
         }
     }
 }
diff --git a/analysis/analysis-api/testData/components/resolveExtensionInfoProvider/extensionScopeWithPsi/multipleExtensions.kt b/analysis/analysis-api/testData/components/resolveExtensionInfoProvider/extensionScopeWithPsi/multipleExtensions.kt
index 91cb62f727d..090b0cd5e31 100644
--- a/analysis/analysis-api/testData/components/resolveExtensionInfoProvider/extensionScopeWithPsi/multipleExtensions.kt
+++ b/analysis/analysis-api/testData/components/resolveExtensionInfoProvider/extensionScopeWithPsi/multipleExtensions.kt
@@ -33,6 +33,6 @@ package main
 import rex1.*
 import rex2.*
 
-object <caret_onAirContext>MainObject : RexClass1, RexClass2 {
+object MainObject : RexClass1, RexClass2 {
     fun foo(): List<Any> = listOf(rexCallable1(), rexCallable2())
 }
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/components/resolveExtensionInfoProvider/extensionScopeWithPsi/singleModule.kt b/analysis/analysis-api/testData/components/resolveExtensionInfoProvider/extensionScopeWithPsi/singleModule.kt
index dd22f60ca23..8098e0b720a 100644
--- a/analysis/analysis-api/testData/components/resolveExtensionInfoProvider/extensionScopeWithPsi/singleModule.kt
+++ b/analysis/analysis-api/testData/components/resolveExtensionInfoProvider/extensionScopeWithPsi/singleModule.kt
@@ -41,4 +41,4 @@ package generated
 open class GenClass2
 
 // FILE: main.kt
-fun <caret_onAirContext>main() {}
\ No newline at end of file
+fun main() {}
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/errorImport.kt b/analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/errorImport.kt
index ac7ab9c22de..9963b35f9ea 100644
--- a/analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/errorImport.kt
+++ b/analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/errorImport.kt
@@ -1,4 +1,4 @@
 import c.b
 
-val a<caret_onAirContext> = 5
+val a = 5
 
diff --git a/analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/importAlias.kt b/analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/importAlias.kt
index 6cc6f4b2007..d316e277f10 100644
--- a/analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/importAlias.kt
+++ b/analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/importAlias.kt
@@ -1,7 +1,7 @@
 // FILE: main.kt
 import other.A as AAA
 
-val a<caret_onAirContext> = 5
+val a = 5
 
 // FILE: other/other.kt
 package other
diff --git a/analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/noImports.kt b/analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/noImports.kt
index 3d1977f2c98..9c350f98a5b 100644
--- a/analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/noImports.kt
+++ b/analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/noImports.kt
@@ -1,3 +1,3 @@
 // RENDER_DEFAULT_IMPORTING_SCOPE
 
-val a<caret_onAirContext> = 5
+val a = 5
diff --git a/analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/simpleImport.kt b/analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/simpleImport.kt
index 98424560dd0..c1317058e92 100644
--- a/analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/simpleImport.kt
+++ b/analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/simpleImport.kt
@@ -1,7 +1,7 @@
 // FILE: main.kt
 import other.A
 
-val a<caret_onAirContext> = 5
+val a = 5
 
 // FILE: other/other.kt
 package other
diff --git a/analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/starImport.kt b/analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/starImport.kt
index 2d8c3e35268..53ead266630 100644
--- a/analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/starImport.kt
+++ b/analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/starImport.kt
@@ -1,7 +1,7 @@
 // FILE: main.kt
 import other.*
 
-val a<caret_onAirContext> = 5
+val a = 5
 
 // FILE: other/other.kt
 package other
diff --git a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/symbolRenderingByReference/javaMethodWithMultipleTypeParametersBound.kt b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/symbolRenderingByReference/javaMethodWithMultipleTypeParametersBound.kt
index 8dda5e0fa02..97ae683c8aa 100644
--- a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/symbolRenderingByReference/javaMethodWithMultipleTypeParametersBound.kt
+++ b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/symbolRenderingByReference/javaMethodWithMultipleTypeParametersBound.kt
@@ -4,7 +4,7 @@
 class J: JavaClass<String> {}
 
 fun some(j: J) {
-  j.f<caret>o<caret_onAirContext>o()
+  j.f<caret>oo()
 }
 
 // FILE: JavaClass.java
diff --git a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/symbolRenderingByReference/javaMethodWithTypeParametersBound.kt b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/symbolRenderingByReference/javaMethodWithTypeParametersBound.kt
index 905de0bd0a5..aad49929ee9 100644
--- a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/symbolRenderingByReference/javaMethodWithTypeParametersBound.kt
+++ b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/symbolRenderingByReference/javaMethodWithTypeParametersBound.kt
@@ -4,7 +4,7 @@
 class J: JavaClass<String> {}
 
 fun some(j: J) {
-  j.f<caret>o<caret_onAirContext>o()
+  j.f<caret>oo()
 }
 
 // FILE: JavaClass.java
diff --git a/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/base/AbstractAnalysisApiBasedTest.kt b/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/base/AbstractAnalysisApiBasedTest.kt
index 3eecae975c5..c7252dc46d1 100644
--- a/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/base/AbstractAnalysisApiBasedTest.kt
+++ b/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/base/AbstractAnalysisApiBasedTest.kt
@@ -26,7 +26,6 @@ import org.jetbrains.kotlin.analysis.test.framework.test.configurators.FrontendK
 import org.jetbrains.kotlin.analysis.test.framework.utils.SkipTestException
 import org.jetbrains.kotlin.analysis.test.framework.utils.singleOrZeroValue
 import org.jetbrains.kotlin.platform.jvm.JvmPlatforms
-import org.jetbrains.kotlin.psi.KtDeclaration
 import org.jetbrains.kotlin.psi.KtElement
 import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.test.TestConfiguration
@@ -379,20 +378,6 @@ abstract class AbstractAnalysisApiBasedTest : TestWithDisposable() {
         }
     }
 
-    /**
-     * Invoke the analysis in the context of given [file]
-     *
-     * To perform the test for in-air analysis, it will look for the declaration marked with the caret `<caret_onAirContext>`
-     */
-    protected fun <R> analyseForTest(file: KtFile, action: KtAnalysisSession.(KtElement) -> R): R {
-        return if (configurator.analyseInDependentSession) {
-            val declaration = testServices.expressionMarkerProvider.getElementOfTypeAtCaret<KtDeclaration>(file, ON_AIR_CONTEXT_CARET_TAG)
-            analyseForTest(declaration, action)
-        } else {
-            analyze(file, action = { action(file) })
-        }
-    }
-
     @BeforeEach
     fun initTestInfo(testInfo: TestInfo) {
         this.testInfo = KotlinTestInfo(
@@ -401,8 +386,4 @@ abstract class AbstractAnalysisApiBasedTest : TestWithDisposable() {
             tags = testInfo.tags
         )
     }
-
-    companion object {
-        private const val ON_AIR_CONTEXT_CARET_TAG = "onAirContext"
-    }
 }
\ No newline at end of file