PyCharm: Get rid of includes in v2 plugins: they do not play well with v2.

Autolayout doesn't obey includes. With plain copy/paste (which is a recommended approach for now) we do not have to list all modules manually in `pluginLayout`.

It is taken from `content`.

We also refactor out PyCharm training, as it depends on plugin that may not exist

GitOrigin-RevId: c225b3565a4b3ea1121a7cdf0b072a63b9448ca4
This commit is contained in:
Ilya.Kazakevich
2024-04-15 19:25:17 +02:00
committed by intellij-monorepo-bot
parent 1fc29219d1
commit 636c384c85
17 changed files with 47 additions and 40 deletions

View File

@@ -5,7 +5,6 @@ import kotlinx.collections.immutable.persistentMapOf
import kotlinx.collections.immutable.persistentSetOf
import kotlinx.collections.immutable.plus
import org.jetbrains.intellij.build.*
import org.jetbrains.intellij.build.impl.PluginLayout
import org.jetbrains.intellij.build.io.copyFileToDir
import java.nio.file.Files
import java.nio.file.Path
@@ -30,20 +29,15 @@ class PyCharmCommunityProperties(private val communityHome: Path) : PyCharmPrope
"intellij.platform.main",
"intellij.pycharm.community",
)
productLayout.bundledPluginModules.add("intellij.python.community.plugin")
productLayout.bundledPluginModules.add("intellij.pycharm.community.customization")
productLayout.bundledPluginModules.add("intellij.vcs.github.community")
productLayout.bundledPluginModules.addAll(Files.readAllLines(communityHome.resolve("python/build/plugin-list.txt")))
productLayout.bundledPluginModules.addAll(
listOf(
"intellij.python.community.plugin", // Python language
"intellij.pycharm.community.customization", // Convert Intellij to PyCharm
"intellij.vcs.github.community") +
Files.readAllLines(communityHome.resolve("python/build/plugin-list.txt"))
)
productLayout.pluginLayouts = CommunityRepositoryModules.COMMUNITY_REPOSITORY_PLUGINS.addAll(listOf(
PluginLayout.plugin(listOf(
"intellij.pycharm.community.customization",
"intellij.pycharm.community.ide.impl",
"intellij.pycharm.community.ide.impl.promotion",
"intellij.jupyter.viewOnly",
"intellij.jupyter.core"
)
),
CommunityRepositoryModules.githubPlugin("intellij.vcs.github.community")
)
)