Introduce configureEnvironment, avoid 'createEnvironment' calls
This commit is contained in:
@@ -91,7 +91,7 @@ abstract class BaseDiagnosticsTest : KotlinMultiFileTestWithJava<TestModule, Tes
|
||||
files: List<TestFile>
|
||||
) {
|
||||
environment = createEnvironment(wholeFile)
|
||||
|
||||
setupEnvironment(environment)
|
||||
analyzeAndCheck(wholeFile, files)
|
||||
}
|
||||
|
||||
|
||||
+4
@@ -93,6 +93,10 @@ public abstract class KotlinMultiFileTestWithJava<M extends KotlinBaseTest.TestM
|
||||
|
||||
}
|
||||
|
||||
protected void setupEnvironment(@NotNull KotlinCoreEnvironment environment) {
|
||||
|
||||
}
|
||||
|
||||
@NotNull
|
||||
protected ConfigurationKind getConfigurationKind() {
|
||||
return ConfigurationKind.JDK_ONLY;
|
||||
|
||||
+4
-6
@@ -54,12 +54,10 @@ abstract class AbstractFirBaseDiagnosticsTest : BaseDiagnosticsTest() {
|
||||
}
|
||||
}
|
||||
|
||||
override fun createEnvironment(file: File): KotlinCoreEnvironment {
|
||||
return super.createEnvironment(file).apply {
|
||||
Extensions.getArea(this.project)
|
||||
.getExtensionPoint(PsiElementFinder.EP_NAME)
|
||||
.unregisterExtension(JavaElementFinder::class.java)
|
||||
}
|
||||
override fun setupEnvironment(environment: KotlinCoreEnvironment) {
|
||||
Extensions.getArea(environment.project)
|
||||
.getExtensionPoint(PsiElementFinder.EP_NAME)
|
||||
.unregisterExtension(JavaElementFinder::class.java)
|
||||
}
|
||||
|
||||
open fun analyzeAndCheckUnhandled(testDataFile: File, files: List<TestFile>, useLightTree: Boolean = false) {
|
||||
|
||||
Reference in New Issue
Block a user