From 598478e28e3e2495d7eee6e24c10690c90526c46 Mon Sep 17 00:00:00 2001
From: "Natalia.Murycheva" <natalia.murycheva@jetbrains.com>
Date: Wed, 11 Jun 2025 22:21:38 +0200
Subject: [PATCH] [PyCharm] PY-81850 Follow up on the "Python" Settings pages
 improvements: settings pages re-ordering

GitOrigin-RevId: 8dcd8f5b62b61f4409902abaff323bf6236fcfb3
---
 .../intellij.pycharm.community.ide.impl.xml   | 27 ++++++++++---------
 .../ide/impl/PyCharmCorePluginConfigurator.kt |  8 ++++--
 .../messages/PyBundle.properties              |  1 +
 3 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/python/ide/impl/resources/intellij.pycharm.community.ide.impl.xml b/python/ide/impl/resources/intellij.pycharm.community.ide.impl.xml
index 96253ede441b..d0c51a36af42 100644
--- a/python/ide/impl/resources/intellij.pycharm.community.ide.impl.xml
+++ b/python/ide/impl/resources/intellij.pycharm.community.ide.impl.xml
@@ -39,6 +39,20 @@
     <backgroundPostStartupActivity id="PyCharmProjectConfigurableStartupActivity"
                                    implementation="com.intellij.pycharm.community.ide.impl.PyCharmProjectConfigurableStartupActivity"/>
 
+    <projectConfigurable groupId="project"
+                         id="com.intellij.pycharm.community.ide.impl.configuration.PythonContentEntriesConfigurable"
+                         bundle="messages.PyBundle"
+                         key="configurable.PythonContentEntriesConfigurable.display.name"
+                         provider="com.intellij.pycharm.community.ide.impl.configuration.PythonContentEntriesConfigurableProvider"
+                         groupWeight="15"/>
+
+    <projectConfigurable groupId="project"
+                         id="com.intellij.pycharm.community.ide.impl.configuration.PyDependenciesConfigurable"
+                         bundle="messages.PyBundle"
+                         key="configurable.PyDependenciesConfigurable.pycharm.display.name"
+                         provider="com.intellij.pycharm.community.ide.impl.configuration.PyDependenciesConfigurableProvider"
+                         groupWeight="5"/>
+
     <groupConfigurable id="python.group.settings"
                        parentId="root"
                        weight="1000"
@@ -46,12 +60,6 @@
                        displayNameKey="settings.python.group.title"
                        descriptionKey="settings.python.group.title"/>
 
-    <projectConfigurable groupId="project"
-                         id="com.intellij.pycharm.community.ide.impl.configuration.PythonContentEntriesConfigurable"
-                         bundle="messages.PyBundle"
-                         key="configurable.PythonContentEntriesConfigurable.display.name"
-                         provider="com.intellij.pycharm.community.ide.impl.configuration.PythonContentEntriesConfigurableProvider"/>
-
     <projectConfigurable groupId="python.group.settings"
                          id="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable"
                          bundle="messages.PyBundle"
@@ -59,13 +67,6 @@
                          instance="com.intellij.pycharm.community.ide.impl.PyCharmPyActiveSdkModuleConfigurable"
                          groupWeight="200"/> <!-- id is used in InterpreterSettingsQuickFix.showPythonInterpreterSettings -->
 
-    <projectConfigurable groupId="python.group.settings"
-                         id="com.intellij.pycharm.community.ide.impl.configuration.PyDependenciesConfigurable"
-                         bundle="messages.PyBundle"
-                         key="configurable.PyDependenciesConfigurable.display.name"
-                         provider="com.intellij.pycharm.community.ide.impl.configuration.PyDependenciesConfigurableProvider"
-                         groupWeight="5"/>
-
     <applicationConfigurable id="memory.settings" groupWeight="45"
                              key="settings.memory.group.title"
                              bundle="messages.PyBundle"
diff --git a/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/PyCharmCorePluginConfigurator.kt b/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/PyCharmCorePluginConfigurator.kt
index db1cb81390e8..778a756eceb7 100644
--- a/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/PyCharmCorePluginConfigurator.kt
+++ b/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/PyCharmCorePluginConfigurator.kt
@@ -119,8 +119,12 @@ private class PyCharmCorePluginConfigurator : ApplicationInitializedListener {
     }
 
     ConfigurableGroupEP.find("Jupyter Settings")?.apply {
-      parentId = PythonMainConfigurable.ID
-      weight = 90
+      parentId = "root"
+      weight = 900
+    }
+
+    ConfigurableGroupEP.find("project")?.apply {
+      weight = 800
     }
   }
 }
diff --git a/python/pluginResources/messages/PyBundle.properties b/python/pluginResources/messages/PyBundle.properties
index b997cf1334be..6abff674d3ca 100644
--- a/python/pluginResources/messages/PyBundle.properties
+++ b/python/pluginResources/messages/PyBundle.properties
@@ -665,6 +665,7 @@ configurable.PySmartKeysOptions.display.name=Python
 configurable.PyContentEntriesModuleConfigurable.display.name=Project Structure
 configurable.PythonContentEntriesConfigurable.display.name=Project Structure
 configurable.PyDependenciesConfigurable.display.name=Project Dependencies
+configurable.PyDependenciesConfigurable.pycharm.display.name=Project Dependencies
 configurable.PyIntegratedToolsConfigurable.display.name=Python Integrated Tools
 configurable.PyIntegratedToolsModulesConfigurable.display.name=Python Integrated Tools
 configurable.PyIntegratedToolsModulesConfigurable.pycharm.display.name=Integrated Tools