From e6114fb2077faa048446c742f3694c25f46b49e4 Mon Sep 17 00:00:00 2001 From: Timur Aliberdov Date: Fri, 26 Sep 2025 20:04:06 +0200 Subject: [PATCH] IJPL-205982: move nonModalWelcomeScreen from `PythonCore` to `intellij.pycharm.community.customization.shared` IdeaUltimatePluginModuleDependenciesTest failed with the following message: `Plugin 'Python Community Edition' conflicts with 'IDEA CORE' and may work incorrectly. Their respective modules 'intellij.platform.ide.nonModalWelcomeScreen' and 'intellij.platform.ide.nonModalWelcomeScreen' declare the same package prefix` GitOrigin-RevId: af33d6b2f341b90103a7db1e0ff5b5a3131427d9 --- .../customization.shared/resources/META-INF/plugin.xml | 3 +++ python/pluginCore/plugin-content.yaml | 9 --------- python/pluginCore/resources/META-INF/plugin.xml | 3 --- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/python/ide/customization.shared/resources/META-INF/plugin.xml b/python/ide/customization.shared/resources/META-INF/plugin.xml index 510ad7937298..e795d1d7bc26 100644 --- a/python/ide/customization.shared/resources/META-INF/plugin.xml +++ b/python/ide/customization.shared/resources/META-INF/plugin.xml @@ -10,6 +10,9 @@ + + + diff --git a/python/pluginCore/plugin-content.yaml b/python/pluginCore/plugin-content.yaml index 6c4808453d38..08b894e06a25 100644 --- a/python/pluginCore/plugin-content.yaml +++ b/python/pluginCore/plugin-content.yaml @@ -1,12 +1,3 @@ -- name: lib/modules/intellij.platform.ide.nonModalWelcomeScreen.backend.jar - contentModules: - - name: intellij.platform.ide.nonModalWelcomeScreen.backend -- name: lib/modules/intellij.platform.ide.nonModalWelcomeScreen.frontend.jar - contentModules: - - name: intellij.platform.ide.nonModalWelcomeScreen.frontend -- name: lib/modules/intellij.platform.ide.nonModalWelcomeScreen.jar - contentModules: - - name: intellij.platform.ide.nonModalWelcomeScreen - name: lib/modules/intellij.python.ast.jar contentModules: - name: intellij.python.ast diff --git a/python/pluginCore/resources/META-INF/plugin.xml b/python/pluginCore/resources/META-INF/plugin.xml index 012698bf5ceb..158729c4b8c4 100644 --- a/python/pluginCore/resources/META-INF/plugin.xml +++ b/python/pluginCore/resources/META-INF/plugin.xml @@ -75,8 +75,5 @@ The Python plug-in provides smart editing for Python scripts. The feature set of - - -