Introduce configureEnvironment, avoid 'createEnvironment' calls

This commit is contained in:
Mikhael Bogdanov
2020-02-25 10:03:10 +01:00
parent a795c38eb7
commit 9052ef06a7
6 changed files with 23 additions and 21 deletions
@@ -91,7 +91,7 @@ abstract class BaseDiagnosticsTest : KotlinMultiFileTestWithJava<TestModule, Tes
files: List<TestFile>
) {
environment = createEnvironment(wholeFile)
setupEnvironment(environment)
analyzeAndCheck(wholeFile, files)
}
@@ -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;
@@ -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) {