mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-03-22 15:19:59 +07:00
[kotlin] KTIJ-28619 application initialization might happen in the createEnvironment method
GitOrigin-RevId: e18a824c126013538d6719dd7f1c25872db65489
This commit is contained in:
committed by
intellij-monorepo-bot
parent
d6881b52a6
commit
43bfdda8dc
@@ -32,11 +32,11 @@ import org.jetbrains.kotlin.config.JVMConfigurationKeys
|
||||
import org.jetbrains.kotlin.config.messageCollector
|
||||
import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
|
||||
import org.jetbrains.kotlin.idea.base.plugin.artifacts.TestKotlinArtifacts
|
||||
import org.jetbrains.kotlin.idea.base.plugin.useK2Plugin
|
||||
import org.jetbrains.kotlin.idea.base.test.KotlinRoot
|
||||
import org.jetbrains.kotlin.idea.test.ConfigurationKind
|
||||
import org.jetbrains.kotlin.idea.test.ExpectedPluginModeProvider
|
||||
import org.jetbrains.kotlin.idea.test.KotlinTestUtils
|
||||
import org.jetbrains.kotlin.idea.test.setUpWithKotlinPlugin
|
||||
import org.jetbrains.kotlin.idea.test.testFramework.resetApplicationToNull
|
||||
import org.jetbrains.kotlin.parsing.KotlinParserDefinition
|
||||
import org.jetbrains.kotlin.resolve.jvm.extensions.AnalysisHandlerExtension
|
||||
@@ -125,8 +125,8 @@ abstract class AbstractKotlinUastTest : TestCase(),
|
||||
|
||||
private fun initializeCoreEnvironment() {
|
||||
CoreApplicationEnvironment.registerApplicationExtensionPoint(
|
||||
UastLanguagePlugin.EP,
|
||||
UastLanguagePlugin::class.java,
|
||||
UastLanguagePlugin.EP,
|
||||
UastLanguagePlugin::class.java,
|
||||
)
|
||||
|
||||
CoreApplicationEnvironment.registerApplicationExtensionPoint(
|
||||
@@ -180,8 +180,14 @@ abstract class AbstractKotlinUastTest : TestCase(),
|
||||
}
|
||||
|
||||
override fun setUp() {
|
||||
super.setUp()
|
||||
testRootDisposable = Disposer.newDisposable()
|
||||
setUpWithKotlinPlugin(testRootDisposable) { super.setUp() }
|
||||
|
||||
val oldUseK2Plugin = useK2Plugin
|
||||
useK2Plugin = pluginMode == KotlinPluginMode.K2
|
||||
Disposer.register(testRootDisposable) {
|
||||
useK2Plugin = oldUseK2Plugin
|
||||
}
|
||||
}
|
||||
|
||||
@Suppress("SSBasedInspection")
|
||||
|
||||
Reference in New Issue
Block a user