From a697724acc2c16588bc29663ffc4391fc7100ac8 Mon Sep 17 00:00:00 2001
From: Vitaly Legchilkin <vitaly.legchilkin@jetbrains.com>
Date: Fri, 2 May 2025 17:23:59 +0200
Subject: [PATCH] [python] merge with latest changes (PY-79451)

GitOrigin-RevId: a50334e1c235d37ed64a61ae298dc25949014c89
---
 .../pluginCore/resources/META-INF/plugin.xml  | 36 ------------------
 .../intellij.python.community.impl.xml        | 38 +++++++++++++++++--
 2 files changed, 35 insertions(+), 39 deletions(-)

diff --git a/python/pluginCore/resources/META-INF/plugin.xml b/python/pluginCore/resources/META-INF/plugin.xml
index c1671891c80d..e966a5ec2402 100644
--- a/python/pluginCore/resources/META-INF/plugin.xml
+++ b/python/pluginCore/resources/META-INF/plugin.xml
@@ -69,40 +69,4 @@ The Python plug-in provides smart editing for Python scripts. The feature set of
     <module name="intellij.python.terminal"/>
 
   </content>
-
-  <actions>
-    <group id="PythonPackageManagerActions" searchable="false">
-      <separator/>
-
-      <action id="UvLockAction"
-              class="com.jetbrains.python.uv.packaging.UvLockAction"
-              icon="com.intellij.icons.AllIcons.Diff.Lock"/>
-
-      <action id="UvSyncAction"
-              class="com.jetbrains.python.uv.packaging.UvSyncAction"
-              icon="com.intellij.icons.AllIcons.Actions.Refresh"/>
-
-
-      <separator/>
-
-      <action id="PoetryLockAction"
-              class="com.jetbrains.python.poetry.packaging.PoetryLockAction"
-              icon="com.intellij.icons.AllIcons.Diff.Lock"/>
-
-      <action id="PoetryUpdateAction"
-              class="com.jetbrains.python.poetry.packaging.PoetryUpdateAction"
-              icon="com.intellij.icons.AllIcons.Actions.Refresh"/>
-
-      <separator/>
-
-      <action id="HatchRunAction"
-              class="com.jetbrains.python.hatch.packaging.HatchRunAction"
-              icon="com.intellij.icons.AllIcons.Actions.Refresh"/>
-
-      <separator/>
-
-      <add-to-group group-id="EditorContextBarMenu" anchor="last"/>
-      <!--<add-to-group group-id="EditorPopupMenu" relative-to-action="ShowIntentionsGroup" anchor="after"/>-->
-    </group>
-  </actions>
 </idea-plugin>
diff --git a/python/pluginResources/intellij.python.community.impl.xml b/python/pluginResources/intellij.python.community.impl.xml
index 8d9b46bfa6a9..3f8571568609 100644
--- a/python/pluginResources/intellij.python.community.impl.xml
+++ b/python/pluginResources/intellij.python.community.impl.xml
@@ -538,9 +538,6 @@
     <suggestedRefactoringSupport language="Python"
                                  implementationClass="com.jetbrains.python.refactoring.suggested.PySuggestedRefactoringSupport"/>
 
-    <!-- Poetry -->
-    <editorFactoryListener implementation="com.jetbrains.python.sdk.poetry.PoetryPyProjectTomlWatcher"/>
-
     <!-- Targets API -->
     <registryKey key="enable.conda.on.targets" defaultValue="false" description="Enables Conda configuration on targets."/>
     <registryKey key="python.packaging.tool.use.project.location.as.working.dir" defaultValue="false"
@@ -1026,6 +1023,41 @@
     </group>
   </actions>
 
+  <actions>
+    <group id="PythonPackageManagerActions" searchable="false">
+      <separator/>
+
+      <action id="UvLockAction"
+              class="com.jetbrains.python.uv.packaging.UvLockAction"
+              icon="com.intellij.icons.AllIcons.Diff.Lock"/>
+
+      <action id="UvSyncAction"
+              class="com.jetbrains.python.uv.packaging.UvSyncAction"
+              icon="com.intellij.icons.AllIcons.Actions.Refresh"/>
+
+
+      <separator/>
+
+      <action id="PoetryLockAction"
+              class="com.jetbrains.python.poetry.packaging.PoetryLockAction"
+              icon="com.intellij.icons.AllIcons.Diff.Lock"/>
+
+      <action id="PoetryUpdateAction"
+              class="com.jetbrains.python.poetry.packaging.PoetryUpdateAction"
+              icon="com.intellij.icons.AllIcons.Actions.Refresh"/>
+
+      <separator/>
+
+      <action id="HatchRunAction"
+              class="com.jetbrains.python.hatch.packaging.HatchRunAction"
+              icon="com.intellij.icons.AllIcons.Actions.Refresh"/>
+
+      <separator/>
+
+      <add-to-group group-id="EditorContextBarMenu" anchor="first"/>
+    </group>
+  </actions>
+
   <extensions defaultExtensionNs="com.intellij.spellchecker">
     <support language="Python" implementationClass="com.jetbrains.python.spellchecker.PythonSpellcheckerStrategy"/>
     <bundledDictionaryProvider implementation="com.jetbrains.python.spellchecker.PythonBundledDictionaryProvider"/>