Skip to content

Commit 67594cd

Browse files
vladimir-koshelevintellij-monorepo-bot
vladimir-koshelev
authored and
intellij-monorepo-bot
committed
[pycharm] finish community migration to v2
# Conflicts: # community/python/pluginCore/resources/META-INF/plugin.xml GitOrigin-RevId: e4d6969fd15a3fddc4d6a03491fb9f9634285edf
1 parent 1ef0d54 commit 67594cd

30 files changed

Lines changed: 1186 additions & 1197 deletions

File tree

‎platform/build-scripts/src/org/jetbrains/intellij/build/python/PythonCommunityPluginModules.kt‎

Lines changed: 1 addition & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -8,59 +8,11 @@ import org.jetbrains.intellij.build.io.copyDir
88
import java.nio.file.Files
99

1010
object PythonCommunityPluginModules {
11-
@JvmField
12-
val COMMUNITY_MODULES: PersistentList<String> = persistentListOf(
13-
"intellij.commandInterface",
14-
"intellij.python.community",
15-
"intellij.python.community.communityOnly",
16-
"intellij.python.community.core.impl",
17-
"intellij.python.community.impl",
18-
"intellij.python.community.impl.poetry",
19-
"intellij.python.community.impl.installer",
20-
"intellij.python.community.impl.huggingFace",
21-
"intellij.python.community.impl.venv",
22-
"intellij.python.community.services.systemPython",
23-
"intellij.python.community.services.shared",
24-
"intellij.python.community.services.internal.impl",
25-
"intellij.python.community.execService",
26-
"intellij.python.community.plugin.impl",
27-
"intellij.python.community.plugin.java",
28-
"intellij.python.community.plugin.minor",
29-
"intellij.python.community.plugin.minorRider",
30-
"intellij.python.copyright",
31-
"intellij.python.featuresTrainer",
32-
"intellij.python.grazie",
33-
"intellij.python.langInjection",
34-
"intellij.python.markdown",
35-
"intellij.python.psi",
36-
"intellij.python.psi.impl",
37-
"intellij.python.pydev",
38-
"intellij.python.sdk",
39-
"intellij.python.terminal",
40-
"intellij.python.ml.features",
41-
"intellij.python.pyproject",
42-
"intellij.python.hatch",
43-
)
44-
45-
/**
46-
* List of modules used in both Python plugin and Python Frontend plugin
47-
*/
48-
@JvmField
49-
val PYTHON_COMMON_MODULES: PersistentList<String> = persistentListOf(
50-
"intellij.python.parser",
51-
"intellij.python.ast",
52-
"intellij.python.syntax",
53-
"intellij.python.syntax.core"
54-
)
5511

5612
const val pythonCommunityName: String = "python-ce"
5713

5814
fun pythonCommunityPluginLayout(body: ((PluginLayout.PluginLayoutSpec) -> Unit)? = null): PluginLayout {
59-
return pythonPlugin("intellij.python.community.plugin", pythonCommunityName, COMMUNITY_MODULES) { spec ->
60-
PYTHON_COMMON_MODULES.forEach {
61-
spec.withModule(it, "python-common.jar")
62-
}
63-
15+
return pythonPlugin("intellij.python.community.plugin", pythonCommunityName, emptyList()) { spec ->
6416
body?.invoke(spec)
6517
spec.withProjectLibrary("XmlRPC")
6618
}

‎python/installer/resources/intellij.python.community.impl.installer.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<idea-plugin>
2+
<dependencies>
3+
<module name="intellij.python.sdk"/>
4+
<module name="intellij.python.community"/>
5+
</dependencies>
6+
</idea-plugin>

‎python/openapi/resources/intellij.python.community.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<idea-plugin>
2+
<dependencies>
3+
<module name="intellij.python.psi"/>
4+
</dependencies>
5+
</idea-plugin>

‎python/pluginCore/plugin-content.yaml‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -28,26 +28,32 @@
2828
module: intellij.python.community.impl
2929
files:
3030
- name: $MAVEN_REPOSITORY$/completion/ml/python/features/ml-completion-prev-exprs-models/1/ml-completion-prev-exprs-models-1.jar
31+
- name: lib/python-ce-frontend.jar
32+
contentModules:
33+
- name: intellij.python.parser
34+
- name: intellij.python.ast
35+
- name: intellij.python.syntax.core
36+
- name: intellij.python.syntax
3137
- name: lib/python-ce.jar
3238
modules:
33-
- name: intellij.python.community
39+
- name: intellij.python.community.plugin
40+
contentModules:
41+
- name: intellij.python.psi
42+
- name: intellij.python.psi.impl
43+
- name: intellij.python.sdk
44+
- name: intellij.python.pyproject
45+
- name: intellij.python.community.impl.poetry
3446
- name: intellij.python.community.core.impl
47+
- name: intellij.python.community
3548
- name: intellij.python.community.impl
36-
- name: intellij.python.community.impl.poetry
49+
- name: intellij.python.community.execService
3750
- name: intellij.python.community.impl.installer
51+
- name: intellij.python.pydev
3852
- name: intellij.python.community.impl.venv
39-
- name: intellij.python.community.services.systemPython
53+
- name: intellij.python.hatch
4054
- name: intellij.python.community.services.shared
4155
- name: intellij.python.community.services.internal.impl
42-
- name: intellij.python.community.execService
43-
- name: intellij.python.psi
44-
- name: intellij.python.psi.impl
45-
- name: intellij.python.pydev
46-
- name: intellij.python.sdk
47-
- name: intellij.python.pyproject
48-
- name: intellij.python.hatch
49-
- name: intellij.python.community.plugin
50-
contentModules:
56+
- name: intellij.python.community.services.systemPython
5157
- name: intellij.python.community.plugin.minor
5258
- name: intellij.python.community.plugin.minorRider
5359
- name: intellij.python.community.communityOnly
@@ -62,18 +68,12 @@
6268
- name: intellij.python.markdown
6369
- name: intellij.python.ml.features
6470
- name: intellij.python.terminal
65-
- name: lib/python-common.jar
66-
modules:
67-
- name: intellij.python.parser
68-
- name: intellij.python.ast
69-
- name: intellij.python.syntax
70-
- name: intellij.python.syntax.core
7171
- name: lib/tuweni-toml.jar
7272
library: tuweni-toml
7373
files:
7474
- name: $MAVEN_REPOSITORY$/org/apache/tuweni/tuweni-toml/2/tuweni-toml-2.jar
7575
- name: $MAVEN_REPOSITORY$/org/antlr/antlr4-runtime/4/antlr4-runtime-4.jar
76-
reason: <- intellij.python.community.impl
76+
reason: <- intellij.python.pyproject
7777
- name: lib/xmlrpc.jar
7878
library: XmlRPC
7979
files:

0 commit comments

Comments
 (0)