MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-16 22:51:17 +07:00
Code Issues Packages Projects Releases Wiki Activity

[modular loader] change the name and values of the 'importance' attribute in product-modules.xml file for consistency (IJPL-128)

Browse Source 
Now 'loading' attribute is supported for content modules in plugin.xml (see IJPL-148565), and since it has the same meaning as the 'importance' attribute in product-modules.xml files, it's better to rename 'importance' to 'loading' and change its values accordingly to avoid confusion.

GitOrigin-RevId: fa737ffc8da628560e45fdef2b97dffdcebfa3b4
This commit is contained in:
Nikolay Chashnikov
2024-09-06 16:42:08 +02:00
committed by intellij-monorepo-bot
parent e9e283d574
commit e2136051b3
3 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
platform/runtime/product/src/serialization/impl/ProductModulesXmlSerializer.java
View File

@@ -41,14 +41,14 @@ public final class ProductModulesXmlSerializer {
if (tagName.equals("module")) { if (tagName.equals("module")) {
if (reader.getAttributeCount() > 0) { if (reader.getAttributeCount() > 0) {
String attributeName = reader.getAttributeLocalName(0); String attributeName = reader.getAttributeLocalName(0);
if (!"importance".equals(attributeName)) { if (!"loading".equals(attributeName)) {
throw new XMLStreamException("Unexpected attribute '" + attributeName + "'"); throw new XMLStreamException("Unexpected attribute '" + attributeName + "'");
} }
String loadingRuleString = reader.getAttributeValue(0); String loadingRuleString = reader.getAttributeValue(0);
switch (loadingRuleString) { switch (loadingRuleString) {
case "optional": loadingRule = RuntimeModuleLoadingRule.OPTIONAL; break; case "optional": loadingRule = RuntimeModuleLoadingRule.OPTIONAL; break;
case "functional": loadingRule = RuntimeModuleLoadingRule.REQUIRED; break; case "required": loadingRule = RuntimeModuleLoadingRule.REQUIRED; break;
case "service": loadingRule = RuntimeModuleLoadingRule.ON_DEMAND; break; case "on-demand": loadingRule = RuntimeModuleLoadingRule.ON_DEMAND; break;
default: throw new XMLStreamException("Unknown loading rule '" + loadingRuleString + "'"); default: throw new XMLStreamException("Unknown loading rule '" + loadingRuleString + "'");
} }
} }

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

@@ -57,9 +57,9 @@ class ProductModulesLoaderTest {
xml(FILE_NAME, """ xml(FILE_NAME, """
<product-modules> <product-modules>
<main-root-modules> <main-root-modules>
<module importance="functional">root</module> <module loading="required">root</module>
<module importance="optional">optional</module> <module loading="optional">optional</module>
<module importance="optional">unknown-optional</module> <module loading="optional">unknown-optional</module>
</main-root-modules> </main-root-modules>
</product-modules> </product-modules>
""".trimIndent()) """.trimIndent())
@@ -148,7 +148,7 @@ class ProductModulesLoaderTest {
<from-module>root</from-module> <from-module>root</from-module>
</include> </include>
<main-root-modules> <main-root-modules>
<module importance="functional">additional</module> <module loading="required">additional</module>
</main-root-modules> </main-root-modules>
<bundled-plugins> <bundled-plugins>
<module>plugin</module> <module>plugin</module>
@@ -217,7 +217,7 @@ class ProductModulesLoaderTest {
<product-modules> <product-modules>
<main-root-modules> <main-root-modules>
${mainModules.joinToString("\n") { ${mainModules.joinToString("\n") {
"<module importance=\"functional\">$it</module>" "<module loading=\"required\">$it</module>"
}} }}
</main-root-modules> </main-root-modules>
<bundled-plugins> <bundled-plugins>

9
plugins/devkit/devkit-core/src/dom/productModules/ProductModulesElement.java
View File

@@ -4,6 +4,7 @@ package org.jetbrains.idea.devkit.dom.productModules;
import com.intellij.util.xml.*; import com.intellij.util.xml.*;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.jetbrains.idea.devkit.dom.ContentDescriptor;
import org.jetbrains.idea.devkit.dom.impl.productModules.IntellijModuleConverter; import org.jetbrains.idea.devkit.dom.impl.productModules.IntellijModuleConverter;
import org.jetbrains.idea.devkit.dom.impl.productModules.PluginXmlFileConverter; import org.jetbrains.idea.devkit.dom.impl.productModules.PluginXmlFileConverter;
import org.jetbrains.idea.devkit.dom.impl.productModules.ProductModulesXmlFileConverter; import org.jetbrains.idea.devkit.dom.impl.productModules.ProductModulesXmlFileConverter;
@@ -40,7 +41,7 @@ public interface ProductModulesElement extends DomElement {
@Convert(IntellijModuleConverter.class) @Convert(IntellijModuleConverter.class)
interface MainRootModuleElement extends GenericDomValue<IntellijModuleSymbol> { interface MainRootModuleElement extends GenericDomValue<IntellijModuleSymbol> {
@Required @Required
@NotNull GenericAttributeValue<ModuleImportanceAttributeValue> getImportance(); @NotNull GenericAttributeValue<ContentDescriptor.ModuleDescriptor.ModuleLoadingRule> getLoading();
} }
interface BundledPluginElements extends DomElement { interface BundledPluginElements extends DomElement {
@@ -51,10 +52,4 @@ public interface ProductModulesElement extends DomElement {
@Convert(PluginXmlFileConverter.class) @Convert(PluginXmlFileConverter.class)
interface BundledPluginElement extends GenericDomValue<IntellijModuleSymbol> { interface BundledPluginElement extends GenericDomValue<IntellijModuleSymbol> {
} }
enum ModuleImportanceAttributeValue {
functional,
optional,
service
}
} }