MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-04 17:20:55 +07:00
Code Issues Packages Projects Releases Wiki Activity

[platform] refactoring: rename ProductMode.LOCAL_IDE to MONOLITH for consistency (RDCT-1417)

Browse Source 
GitOrigin-RevId: 145088995b32517ae536e626d8d54dfb31a25331
This commit is contained in:
Nikolay Chashnikov
2024-07-05 10:24:19 +02:00
committed by intellij-monorepo-bot
parent cb4fdfc2fc
commit 366d2f2ea3
9 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
platform/bootstrap/src/com/intellij/platform/bootstrap/ModuleBasedProductLoadingStrategy.kt
View File

@@ -32,7 +32,7 @@ import kotlin.io.path.extension
internal class ModuleBasedProductLoadingStrategy(internal val moduleRepository: RuntimeModuleRepository) : ProductLoadingStrategy() { internal class ModuleBasedProductLoadingStrategy(internal val moduleRepository: RuntimeModuleRepository) : ProductLoadingStrategy() {
private val currentMode by lazy { private val currentMode by lazy {
val currentModeId = System.getProperty(PLATFORM_PRODUCT_MODE_PROPERTY, ProductMode.LOCAL_IDE.id) val currentModeId = System.getProperty(PLATFORM_PRODUCT_MODE_PROPERTY, ProductMode.MONOLITH.id)
val currentMode = ProductMode.entries.find { it.id == currentModeId } val currentMode = ProductMode.entries.find { it.id == currentModeId }
if (currentMode == null) { if (currentMode == null) {
error("Unknown mode '$currentModeId' specified in '$PLATFORM_PRODUCT_MODE_PROPERTY' system property") error("Unknown mode '$currentModeId' specified in '$PLATFORM_PRODUCT_MODE_PROPERTY' system property")

2
platform/build-scripts/src/org/jetbrains/intellij/build/ProductProperties.kt
View File

@@ -213,7 +213,7 @@ abstract class ProductProperties {
* This property makes sense only if [rootModuleForModularLoader] is set to a non-null value. * This property makes sense only if [rootModuleForModularLoader] is set to a non-null value.
*/ */
@ApiStatus.Experimental @ApiStatus.Experimental
var productMode: ProductMode = ProductMode.LOCAL_IDE var productMode: ProductMode = ProductMode.MONOLITH
/** /**
* Specifies name of cross-platform ZIP archive if `[buildCrossPlatformDistribution]` is set to `true`. * Specifies name of cross-platform ZIP archive if `[buildCrossPlatformDistribution]` is set to `true`.

2
platform/core-impl/src/com/intellij/ide/plugins/PathBasedProductLoadingStrategy.kt
View File

@@ -10,7 +10,7 @@ import java.nio.file.Path
internal class PathBasedProductLoadingStrategy : ProductLoadingStrategy() { internal class PathBasedProductLoadingStrategy : ProductLoadingStrategy() {
// this property returns hardcoded Strings instead of ProductMode, because currently ProductMode class isn't available in dependencies of this module // this property returns hardcoded Strings instead of ProductMode, because currently ProductMode class isn't available in dependencies of this module
override val currentModeId: String override val currentModeId: String
get() = if (AppMode.isRemoteDevHost()) "backend" else "local_IDE" get() = if (AppMode.isRemoteDevHost()) "backend" else "monolith"
override fun addMainModuleGroupToClassPath(bootstrapClassLoader: ClassLoader) { override fun addMainModuleGroupToClassPath(bootstrapClassLoader: ClassLoader) {
} }

2
platform/runtime/product/api-dump.txt
View File

@@ -15,7 +15,7 @@
- java.lang.Enum - java.lang.Enum
- sf:BACKEND:com.intellij.platform.runtime.product.ProductMode - sf:BACKEND:com.intellij.platform.runtime.product.ProductMode
- sf:FRONTEND:com.intellij.platform.runtime.product.ProductMode - sf:FRONTEND:com.intellij.platform.runtime.product.ProductMode
- sf:LOCAL_IDE:com.intellij.platform.runtime.product.ProductMode - sf:MONOLITH:com.intellij.platform.runtime.product.ProductMode
- getId():java.lang.String - getId():java.lang.String
- s:valueOf(java.lang.String):com.intellij.platform.runtime.product.ProductMode - s:valueOf(java.lang.String):com.intellij.platform.runtime.product.ProductMode
- s:values():com.intellij.platform.runtime.product.ProductMode[] - s:values():com.intellij.platform.runtime.product.ProductMode[]

2
platform/runtime/product/src/ProductMode.java
View File

@@ -12,7 +12,7 @@ public enum ProductMode {
/** /**
* Indicates that this process performs all necessary tasks to provide smart features itself. This is the default mode for all IDEs. * Indicates that this process performs all necessary tasks to provide smart features itself. This is the default mode for all IDEs.
*/ */
LOCAL_IDE("local_IDE"), MONOLITH("monolith"),
/** /**
* Indicates that this process doesn't perform heavy tasks like code analysis, and takes necessary information from another process. * Indicates that this process doesn't perform heavy tasks like code analysis, and takes necessary information from another process.
* Currently, this is used by JetBrains Client process connected to a remote development host or CodeWithMe session. * Currently, this is used by JetBrains Client process connected to a remote development host or CodeWithMe session.

2
platform/runtime/product/src/impl/ProductModes.java
View File

@@ -22,7 +22,7 @@ final class ProductModes {
case FRONTEND: return RuntimeModuleId.module("intellij.platform.monolith"); case FRONTEND: return RuntimeModuleId.module("intellij.platform.monolith");
//this module doesn't exist yet, it will be added when we need to use it //this module doesn't exist yet, it will be added when we need to use it
case LOCAL_IDE: return RuntimeModuleId.module("intellij.platform.frontend"); case MONOLITH: return RuntimeModuleId.module("intellij.platform.frontend");
//currently we use the same modules in 'backend' and 'localIde' modes, in the future we may disable some UI-only modules in 'backend' mode //currently we use the same modules in 'backend' and 'localIde' modes, in the future we may disable some UI-only modules in 'backend' mode
case BACKEND: return RuntimeModuleId.module("intellij.platform.frontend"); case BACKEND: return RuntimeModuleId.module("intellij.platform.frontend");

8
platform/runtime/product/tests/testSrc/serialization/ProductModulesLoaderTest.kt
View File

@@ -32,7 +32,7 @@ class ProductModulesLoaderTest {
) )
writePluginXmlWithModules(tempDirectory.rootPath / "plugin", "<idea-plugin><id>plugin</id></idea-plugin>") writePluginXmlWithModules(tempDirectory.rootPath / "plugin", "<idea-plugin><id>plugin</id></idea-plugin>")
val xml = generateProductModulesWithPlugin() val xml = generateProductModulesWithPlugin()
val productModules = ProductModulesSerialization.loadProductModules(xml, ProductMode.LOCAL_IDE, repository) val productModules = ProductModulesSerialization.loadProductModules(xml, ProductMode.MONOLITH, repository)
val mainGroupModules = productModules.mainModuleGroup.includedModules.sortedBy { it.moduleDescriptor.moduleId.stringId } val mainGroupModules = productModules.mainModuleGroup.includedModules.sortedBy { it.moduleDescriptor.moduleId.stringId }
assertEquals(2, mainGroupModules.size) assertEquals(2, mainGroupModules.size)
val (root, util) = mainGroupModules val (root, util) = mainGroupModules
@@ -64,7 +64,7 @@ class ProductModulesLoaderTest {
</product-modules> </product-modules>
""".trimIndent()) """.trimIndent())
}.generateInTempDir().resolve(FILE_NAME) }.generateInTempDir().resolve(FILE_NAME)
val productModules = ProductModulesSerialization.loadProductModules(xml, ProductMode.LOCAL_IDE, repository) val productModules = ProductModulesSerialization.loadProductModules(xml, ProductMode.MONOLITH, repository)
val mainGroupModules = productModules.mainModuleGroup.includedModules.sortedBy { it.moduleDescriptor.moduleId.stringId } val mainGroupModules = productModules.mainModuleGroup.includedModules.sortedBy { it.moduleDescriptor.moduleId.stringId }
assertEquals(2, mainGroupModules.size) assertEquals(2, mainGroupModules.size)
val (optional, root) = mainGroupModules val (optional, root) = mainGroupModules
@@ -86,7 +86,7 @@ class ProductModulesLoaderTest {
writePluginXmlWithModules(tempDirectory.rootPath / "plugin", "plugin", "optional", "unknown") writePluginXmlWithModules(tempDirectory.rootPath / "plugin", "plugin", "optional", "unknown")
val xml = generateProductModulesWithPlugin() val xml = generateProductModulesWithPlugin()
val productModules = ProductModulesSerialization.loadProductModules(xml, ProductMode.LOCAL_IDE, repository) val productModules = ProductModulesSerialization.loadProductModules(xml, ProductMode.MONOLITH, repository)
val pluginModuleGroup = productModules.bundledPluginModuleGroups.single() val pluginModuleGroup = productModules.bundledPluginModuleGroups.single()
val pluginModules = pluginModuleGroup.includedModules val pluginModules = pluginModuleGroup.includedModules
assertEquals(2, pluginModules.size) assertEquals(2, pluginModules.size)
@@ -123,7 +123,7 @@ class ProductModulesLoaderTest {
assertEquals("plugin.common", common.moduleDescriptor.moduleId.stringId) assertEquals("plugin.common", common.moduleDescriptor.moduleId.stringId)
assertEquals(additionalModuleName, additional.moduleDescriptor.moduleId.stringId) assertEquals(additionalModuleName, additional.moduleDescriptor.moduleId.stringId)
} }
checkGroup(ProductMode.LOCAL_IDE, "plugin.localIde") checkGroup(ProductMode.MONOLITH, "plugin.localIde")
checkGroup(ProductMode.FRONTEND, "plugin.frontend") checkGroup(ProductMode.FRONTEND, "plugin.frontend")
} }

2
platform/statistics/src/com/intellij/internal/statistic/eventLog/StatisticsEventLogger.kt
View File

@@ -120,7 +120,7 @@ abstract class StatisticsEventLoggerProvider(val recorderId: String,
// Use `String?` instead of boolean flag for future expansion with other IDE modes // Use `String?` instead of boolean flag for future expansion with other IDE modes
val ideMode = if(AppMode.isRemoteDevHost()) "RDH" else null val ideMode = if(AppMode.isRemoteDevHost()) "RDH" else null
val currentProductModeId = ProductLoadingStrategy.strategy.currentModeId val currentProductModeId = ProductLoadingStrategy.strategy.currentModeId
val productMode = if (currentProductModeId != ProductMode.LOCAL_IDE.id) { val productMode = if (currentProductModeId != ProductMode.MONOLITH.id) {
currentProductModeId currentProductModeId
} else if (detectClionNova()) { } else if (detectClionNova()) {
"nova" "nova"

2
tools/devLauncher/src/IntellijDevLauncher.kt
View File

@@ -56,7 +56,7 @@ fun main(args: Array<String>) {
} }
private fun loadProductModules(moduleRepository: RuntimeModuleRepository, projectHome: Path): ProductModules { private fun loadProductModules(moduleRepository: RuntimeModuleRepository, projectHome: Path): ProductModules {
val currentModeId = System.getProperty(PLATFORM_PRODUCT_MODE_PROPERTY, ProductMode.LOCAL_IDE.id) val currentModeId = System.getProperty(PLATFORM_PRODUCT_MODE_PROPERTY, ProductMode.MONOLITH.id)
val currentMode = ProductMode.entries.find { it.id == currentModeId } val currentMode = ProductMode.entries.find { it.id == currentModeId }
if (currentMode == null) { if (currentMode == null) {
reportError("Unknown mode '$currentModeId' specified in '$PLATFORM_PRODUCT_MODE_PROPERTY' system property") reportError("Unknown mode '$currentModeId' specified in '$PLATFORM_PRODUCT_MODE_PROPERTY' system property")