MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-384621 Java IDE Customization: convert content module to JPS module

Browse Source 
intellij.java.ide.customization.training module is extracted. The root package name is changed to follow the naming convention. Dependencies in intellij.java.ide.customization are cleaned up.

GitOrigin-RevId: c4465b1daaa2f3d33f9dc2b4b0d039e9209291f4
This commit is contained in:
Nikolay Chashnikov
2026-01-13 20:16:53 +00:00
committed by intellij-monorepo-bot
parent b017080903
commit 0f09fe9a3e
12 changed files with 58 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/modules.xml
Generated
+1
View File
@@ -550,6 +550,7 @@
<module fileurl="file://$PROJECT_DIR$/platform/forms_rt/intellij.java.guiForms.rt.iml" filepath="$PROJECT_DIR$/platform/forms_rt/intellij.java.guiForms.rt.iml" />
<module fileurl="file://$PROJECT_DIR$/plugins/java-i18n/intellij.java.i18n.iml" filepath="$PROJECT_DIR$/plugins/java-i18n/intellij.java.i18n.iml" />
<module fileurl="file://$PROJECT_DIR$/java/ide-customization/intellij.java.ide.customization.iml" filepath="$PROJECT_DIR$/java/ide-customization/intellij.java.ide.customization.iml" />
<module fileurl="file://$PROJECT_DIR$/java/ide-customization/training/intellij.java.ide.customization.training.iml" filepath="$PROJECT_DIR$/java/ide-customization/training/intellij.java.ide.customization.training.iml" />
<module fileurl="file://$PROJECT_DIR$/java/ide-resources/intellij.java.ide.resources.iml" filepath="$PROJECT_DIR$/java/ide-resources/intellij.java.ide.resources.iml" />
<module fileurl="file://$PROJECT_DIR$/java/java-impl/intellij.java.impl.iml" filepath="$PROJECT_DIR$/java/java-impl/intellij.java.impl.iml" />
<module fileurl="file://$PROJECT_DIR$/java/java-impl-inspections/intellij.java.impl.inspections.iml" filepath="$PROJECT_DIR$/java/java-impl-inspections/intellij.java.impl.inspections.iml" />
BUILD.bazel
+1
View File
@@ -149,6 +149,7 @@ jvm_library(
"//plugins/properties:properties-backend",
"//java/ide-resources",
"//java/ide-customization",
"//java/ide-customization/training",
"//resources:java-resources",
"//resources-en:java-resources-en",
"//spellchecker",
build/bazel-generated-file-list.txt
+1
View File
@@ -296,6 +296,7 @@ java/execution/impl
java/execution/openapi
java/execution/shared
java/ide-customization
java/ide-customization/training
java/ide-resources
java/idea-ui
java/java-analysis-api
intellij.idea.community.main.iml
+1
View File
@@ -46,6 +46,7 @@
<orderEntry type="module" module-name="intellij.properties.backend" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.java.ide.resources" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.java.ide.customization" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.java.ide.customization.training" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.java.resources" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.java.resources.en" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.spellchecker" scope="RUNTIME" />
java/ide-customization/BUILD.bazel
-3
View File
@@ -17,9 +17,6 @@ jvm_library(
"//java/java-psi-api:psi",
"//platform/core-api:core",
"//platform/lang-api:lang",
"//plugins/ide-features-trainer:featuresTrainer",
"//platform/util:util-ui",
"//java/java-features-trainer:featuresTrainer",
"//platform/platform-impl:ide-impl",
"//platform/lang-core",
],
java/ide-customization/intellij.java.ide.customization.iml
-3
View File
@@ -18,9 +18,6 @@
<orderEntry type="module" module-name="intellij.java.impl" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.platform.testRunner" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.notebooks.visualization" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.featuresTrainer" />
<orderEntry type="module" module-name="intellij.platform.util.ui" />
<orderEntry type="module" module-name="intellij.java.featuresTrainer" />
<orderEntry type="module" module-name="intellij.platform.ide.impl" />
<orderEntry type="module" module-name="intellij.platform.lang.core" />
</component>
java/ide-customization/plugin-content.yaml
+4 -1
View File
@@ -1,3 +1,6 @@
- name: lib/java-ide-customization.jar
modules:
- name: intellij.java.ide.customization
- name: intellij.java.ide.customization
- name: lib/modules/intellij.java.ide.customization.training.jar
contentModules:
- name: intellij.java.ide.customization.training
java/ide-customization/resources/META-INF/plugin.xml
+1 -1
View File
@@ -14,7 +14,7 @@
</dependencies>
<content namespace="jetbrains">
<module name="intellij.java.ide.customization/training"/>
<module name="intellij.java.ide.customization.training"/>
</content>
<resource-bundle>messages.ActionsBundle</resource-bundle>
java/ide-customization/training/BUILD.bazel
+26
View File
@@ -0,0 +1,26 @@
### auto-generated section `build intellij.java.ide.customization.training` start
load("@rules_jvm//:jvm.bzl", "jvm_library", "resourcegroup")
resourcegroup(
name = "training_resources",
srcs = glob(["resources/**/*"]),
strip_prefix = "resources"
)
jvm_library(
name = "training",
module_name = "intellij.java.ide.customization.training",
visibility = ["//visibility:public"],
srcs = glob(["src/**/*.kt", "src/**/*.java", "src/**/*.form"], allow_empty = True),
resources = [":training_resources"],
deps = [
"//java/java-features-trainer:featuresTrainer",
"//platform/util:util-ui",
"//platform/core-api:core",
"//platform/platform-api:ide",
"//plugins/ide-features-trainer:featuresTrainer",
"@lib//:kotlin-stdlib",
"@lib//:jetbrains-annotations",
]
)
### auto-generated section `build intellij.java.ide.customization.training` end
java/ide-customization/training/intellij.java.ide.customization.training.iml
+19
View File
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<module version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" packagePrefix="com.intellij.java.ide.customization.training" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="intellij.java.featuresTrainer" />
<orderEntry type="module" module-name="intellij.platform.util.ui" />
<orderEntry type="module" module-name="intellij.platform.core" />
<orderEntry type="module" module-name="intellij.platform.ide" />
<orderEntry type="module" module-name="intellij.featuresTrainer" />
<orderEntry type="library" name="kotlin-stdlib" level="project" />
<orderEntry type="library" name="jetbrains-annotations" level="project" />
</component>
</module>
java/ide-customization/resources/intellij.java.ide.customization.training.xml → java/ide-customization/training/resources/intellij.java.ide.customization.training.xml
+2 -2
View File
@@ -1,10 +1,10 @@
<idea-plugin package="com.intellij.ide.customization.java.training">
<idea-plugin>
<dependencies>
<plugin id="training"/>
<module name="intellij.java.featuresTrainer"/>
</dependencies>
<extensions defaultExtensionNs="com.intellij">
<startPagePromoter id="JavaOnboardingTourPromoter" implementation="com.intellij.ide.customization.java.training.JavaOnboardingTourPromoter"/>
<startPagePromoter id="JavaOnboardingTourPromoter" implementation="com.intellij.java.ide.customization.training.JavaOnboardingTourPromoter"/>
</extensions>
</idea-plugin>
java/ide-customization/src/com/intellij/ide/customization/java/training/JavaOnboardingTourPromoter.kt → java/ide-customization/training/src/JavaOnboardingTourPromoter.kt
+2 -2
View File
@@ -1,5 +1,5 @@
// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.intellij.ide.customization.java.training
// Copyright 2000-2026 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.intellij.java.ide.customization.training
import com.intellij.java.ift.JavaLessonsBundle
import com.intellij.java.ift.javaLanguageId