MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-21 05:51:25 +07:00
Code Issues Packages Projects Releases Wiki Activity

[warmup] IJPL-29: Avoid direct dependencies on intellij.platform.warmup module

Browse Source 
GitOrigin-RevId: fd3dfed4aec7e2d51bc03efe2b416cfb33a4e0d8
This commit is contained in:
Konstantin Nisht
2022-12-28 17:53:19 +03:00
committed by intellij-monorepo-bot
parent d24fa4a039
commit 485a8e8397
13 changed files with 8 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
platform/platform-resources/src/META-INF/PlatformLangPlugin.xml
View File

@@ -60,7 +60,6 @@
<postStartupActivity implementation="com.intellij.openapi.projectRoots.impl.UnknownSdkStartupChecker"/>
<commandLineInspectionProjectConfigurator implementation="com.intellij.openapi.projectRoots.impl.UnknownSdkInspectionCommandLineConfigurator"/>
<warmupConfigurator implementation="com.intellij.warmup.impl.UnknownSdkInspectionWarmupConfigurator"/>
<registryKey key="unknown.sdk" defaultValue="true" description="Check for unknown SDKs and provide automatic fixes or smart suggestions"/>
<registryKey key="unknown.sdk.auto" defaultValue="true" description="Checks and resolves unknown SDKs automatically on start"/>
<registryKey key="unknown.sdk.modal.jps" defaultValue="true" description="Run unknown JDK test before JPS build is started"/>

6
platform/warmup/src/com/intellij/warmup/impl/UnknownSdkInspectionWarmupConfigurator.kt
View File

@@ -1,6 +0,0 @@
// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.intellij.warmup.impl
import com.intellij.openapi.projectRoots.impl.UnknownSdkInspectionCommandLineConfigurator
class UnknownSdkInspectionWarmupConfigurator : WarmupConfiguratorOfCLIConfigurator(UnknownSdkInspectionCommandLineConfigurator())

2
platform/warmup/src/com/intellij/warmup/impl/WarmupConfiguratorOfCLIConfigurator.kt → platform/warmup/src/com/intellij/warmup/impl/WarmupConfiguratorOfCLIConfigurators.kt
View File

@@ -22,7 +22,7 @@ import kotlin.coroutines.coroutineContext
*/
@ApiStatus.Internal
@ApiStatus.Obsolete
abstract class WarmupConfiguratorOfCLIConfigurator(val delegate: CommandLineInspectionProjectConfigurator) : WarmupConfigurator {
class WarmupConfiguratorOfCLIConfigurator(val delegate: CommandLineInspectionProjectConfigurator) : WarmupConfigurator {
override suspend fun prepareEnvironment(projectPath: Path) =
withRawProgressReporter {

8
platform/warmup/src/com/intellij/warmup/util/ProjectUtil.kt
View File

@@ -3,6 +3,7 @@ package com.intellij.warmup.util
import com.intellij.conversion.ConversionListener
import com.intellij.conversion.ConversionService
import com.intellij.ide.CommandLineInspectionProjectConfigurator
import com.intellij.ide.impl.OpenProjectTask
import com.intellij.ide.impl.PatchProjectUtil
import com.intellij.ide.impl.ProjectUtil
@@ -18,6 +19,7 @@ import com.intellij.openapi.roots.OrderRootType
import com.intellij.openapi.roots.ProjectRootManager
import com.intellij.openapi.vfs.VfsUtil
import com.intellij.openapi.vfs.VirtualFileManager
import com.intellij.warmup.impl.WarmupConfiguratorOfCLIConfigurator
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
import java.nio.file.Path
@@ -164,7 +166,7 @@ private suspend fun callProjectConfigurators(
if (!projectArgs.configureProject) return
val activeConfigurators = WarmupConfigurator.EP_NAME.extensionList.filter {
val activeConfigurators = getAllConfigurators().filter {
if (it.name in projectArgs.disabledConfigurators) {
ConsoleLog.info("Configurator ${it.name} is disabled in the settings")
false
@@ -187,3 +189,7 @@ private suspend fun callProjectConfigurators(
yieldThroughInvokeLater()
}
private fun getAllConfigurators() : List<WarmupConfigurator> {
return WarmupConfigurator.EP_NAME.extensionList + CommandLineInspectionProjectConfigurator.EP_NAME.extensionList.map(::WarmupConfiguratorOfCLIConfigurator)
}

1
plugins/gradle/intellij.gradle.common.iml
View File

@@ -43,6 +43,5 @@
<orderEntry type="library" name="kotlinx-coroutines-jdk8" level="project" />
<orderEntry type="module" module-name="intellij.platform.diagnostic.telemetry" />
<orderEntry type="library" name="opentelemetry" level="project" />
<orderEntry type="module" module-name="intellij.platform.warmup" />
</component>
</module>

1
plugins/gradle/plugin-resources/META-INF/plugin.xml
View File

@@ -181,7 +181,6 @@
<registryKey key="gradle.version.catalogs.dynamic.support" defaultValue="true"
description="Enable experimental support of version catalogs based on after-sync gradle models"/>
<commandLineInspectionProjectConfigurator implementation="org.jetbrains.plugins.gradle.GradleCommandLineProjectConfigurator"/>
<warmupConfigurator implementation="org.jetbrains.plugins.gradle.GradleWarmupConfigurator"/>
<notificationGroup id="Gradle Notification Group" displayType="STICKY_BALLOON" bundle="messages.GradleBundle" key="notification.group.gradle"/>
<statistics.notificationIdsHolder implementation="org.jetbrains.plugins.gradle.service.project.GradleNotificationIdsHolder"/>
<iconMapper mappingFile="GradleIconMappings.json"/>

6
plugins/gradle/src/org/jetbrains/plugins/gradle/GradleWarmupConfigurator.kt
View File

@@ -1,6 +0,0 @@
// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.jetbrains.plugins.gradle
import com.intellij.warmup.impl.WarmupConfiguratorOfCLIConfigurator
class GradleWarmupConfigurator : WarmupConfiguratorOfCLIConfigurator(GradleCommandLineProjectConfigurator())

1
plugins/maven/intellij.maven.iml
View File

@@ -78,7 +78,6 @@
<orderEntry type="module" module-name="intellij.platform.buildScripts.downloader" />
<orderEntry type="module" module-name="intellij.platform.util.jdom" />
<orderEntry type="module" module-name="intellij.platform.ide.core" />
<orderEntry type="module" module-name="intellij.platform.warmup" />
</component>
<component name="copyright">
<Base>

6
plugins/maven/src/main/java/org/jetbrains/idea/maven/MavenWarmupConfigurator.kt
View File

@@ -1,6 +0,0 @@
// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.jetbrains.idea.maven
import com.intellij.warmup.impl.WarmupConfiguratorOfCLIConfigurator
class MavenWarmupConfigurator : WarmupConfiguratorOfCLIConfigurator(MavenCommandLineInspectionProjectConfigurator())

1
plugins/maven/src/main/resources/META-INF/plugin.xml
View File

@@ -369,7 +369,6 @@
<newProjectWizard.java.buildSystem implementation="org.jetbrains.idea.maven.wizards.MavenJavaNewProjectWizard"/>
<commandLineInspectionProjectConfigurator implementation="org.jetbrains.idea.maven.MavenCommandLineInspectionProjectConfigurator"/>
<warmupConfigurator implementation="org.jetbrains.idea.maven.MavenWarmupConfigurator"/>
<externalSystem.dependencyModifier implementation="org.jetbrains.idea.maven.dsl.MavenDependencyModificator"/>
<iconMapper mappingFile="MavenIconMappings.json"/>

2
python/pluginJava/META-INF/python-community-plugin-java.xml
View File

@@ -17,8 +17,6 @@
<sdkEditorAdditionalOptionsProvider implementation="com.jetbrains.python.PythonSdkEditorAdditionalOptionsProvider"/>
<commandLineInspectionProjectConfigurator implementation="com.jetbrains.python.inspections.PythonPluginCommandLineInspectionProjectConfigurator"/>
<warmupConfigurator implementation="com.jetbrains.python.inspections.PythonPluginWarmupConfigurator"/>
</extensions>
<extensions defaultExtensionNs="Pythonid">

6
python/pluginJava/com/jetbrains/python/inspections/PythonPluginWarmupConfigurator.kt
View File

@@ -1,6 +0,0 @@
// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.jetbrains.python.inspections
import com.intellij.warmup.impl.WarmupConfiguratorOfCLIConfigurator
class PythonPluginWarmupConfigurator : WarmupConfiguratorOfCLIConfigurator(PythonPluginCommandLineInspectionProjectConfigurator())

1
python/pluginJava/intellij.python.community.plugin.java.iml
View File

@@ -21,6 +21,5 @@
<orderEntry type="module" module-name="intellij.platform.core.ui" />
<orderEntry type="module" module-name="intellij.platform.util.jdom" />
<orderEntry type="module" module-name="intellij.python.community.core.impl" />
<orderEntry type="module" module-name="intellij.platform.warmup" />
</component>
</module>