From 3d39aff1b3edb2fbc92685e8dad8e062477b9ec4 Mon Sep 17 00:00:00 2001
From: Konstantin Hudyakov <konstantin.hudyakov@jetbrains.com>
Date: Wed, 2 Nov 2022 09:58:45 +0200
Subject: [PATCH] IDEA-299725 Move common refactoring features to platform

GitOrigin-RevId: 0c65d4b61ad1133fb3af42833c09322f8dc28e65
---
 .../ProductivityFeaturesRegistry.xml          | 50 +++----------------
 .../PlatformProductivityFeatures.xml          | 44 ++++++++++++++++
 .../FeatureStatisticsBundle.properties        |  1 +
 .../ProductivityFeaturesRegistry.xml          | 39 ---------------
 4 files changed, 52 insertions(+), 82 deletions(-)

diff --git a/java/ide-resources/resources/ProductivityFeaturesRegistry.xml b/java/ide-resources/resources/ProductivityFeaturesRegistry.xml
index 56c30a992fba..06d9bf6bf2eb 100644
--- a/java/ide-resources/resources/ProductivityFeaturesRegistry.xml
+++ b/java/ide-resources/resources/ProductivityFeaturesRegistry.xml
@@ -117,20 +117,6 @@
       first-show="5"
       successive-show="7">
     </feature>
-    <feature
-      id="codeassists.surroundwith.statement"
-      tip-id="SurroundWith"
-      first-show="5"
-      successive-show="5"
-      min-usage-count="4"
-      />
-    <feature
-      id="codeassists.surroundwith.expression"
-      tip-id="SurroundWith"
-      first-show="6"
-      successive-show="5"
-      min-usage-count="3"
-      />
     <feature
       id="codeassists.comment.block"
       tip-id="CommentCode"
@@ -162,6 +148,13 @@
   </group>
 
   <group id="refactoring">
+    <feature
+      id="codeassists.surroundwith.expression"
+      tip-id="SurroundWith"
+      first-show="6"
+      successive-show="5"
+      min-usage-count="3"
+    />
     <feature 
       id="refactoring.move.moveInner" 
       tip-id="MoveInnerToUpper"
@@ -169,30 +162,6 @@
       first-show="5"
       successive-show="10"
     />
-    <feature
-      id="refactoring.introduceVariable.incompleteStatement"
-      tip-id="IntroduceVariableIncompleteCode"
-      min-usage-count="5"
-      first-show="3"
-      successive-show="7"
-      />
-
-    <feature
-      id="refactoring.introduceVariable"
-      tip-id="IntroduceVariable"
-      min-usage-count="5"
-      first-show="1"
-      successive-show="3"
-      />
-    
-    <feature
-      id="refactoring.rename"
-      tip-id="Rename"
-      min-usage-count="2"
-      first-show="1"
-      successive-show="3"
-      />
-
     <feature
       id="refactoring.copyClass"
       tip-id="CopyClass"
@@ -200,11 +169,6 @@
       first-show="10"
       successive-show="8"
       />
-    <feature id="refactoring.show.quick.list"
-             tip-id="RefactorThis"
-             show-in-guide="false">
-      <track-action id="Refactorings.QuickListPopupAction"/>
-    </feature>
   </group>
   
 
diff --git a/platform/platform-api/resources/PlatformProductivityFeatures.xml b/platform/platform-api/resources/PlatformProductivityFeatures.xml
index cb139ac5b107..ce9f7db7af17 100644
--- a/platform/platform-api/resources/PlatformProductivityFeatures.xml
+++ b/platform/platform-api/resources/PlatformProductivityFeatures.xml
@@ -336,4 +336,48 @@
              successive-show="5"
     />
   </group>
+
+
+  <group id="refactoring">
+    <feature id="codeassists.surroundwith.statement"
+             tip-id="SurroundWith"
+             first-show="5"
+             successive-show="5"
+             min-usage-count="4"
+    />
+
+    <feature id="refactoring.introduceVariable"
+             tip-id="IntroduceVariable"
+             min-usage-count="5"
+             first-show="1"
+             successive-show="3"
+    />
+
+    <feature id="refactoring.introduceVariable.incompleteStatement"
+             tip-id="IntroduceVariableIncompleteCode"
+             min-usage-count="5"
+             first-show="3"
+             successive-show="7"
+    />
+
+    <feature id="refactoring.rename"
+             tip-id="Rename"
+             min-usage-count="2"
+             first-show="1"
+             successive-show="3"
+    />
+
+    <feature id="refactoring.show.quick.list"
+             tip-id="RefactorThis"
+             show-in-guide="false">
+      <track-action id="Refactorings.QuickListPopupAction"/>
+    </feature>
+
+    <feature id="refactoring.extractMethod"
+             tip-id="ExtractMethod"
+             min-usage-count="5"
+             first-show="1"
+             successive-show="3"
+    />
+  </group>
 </component>
\ No newline at end of file
diff --git a/platform/platform-api/resources/messages/FeatureStatisticsBundle.properties b/platform/platform-api/resources/messages/FeatureStatisticsBundle.properties
index 291996840ab4..be7d73ab55fe 100644
--- a/platform/platform-api/resources/messages/FeatureStatisticsBundle.properties
+++ b/platform/platform-api/resources/messages/FeatureStatisticsBundle.properties
@@ -75,6 +75,7 @@ refactoring.introduceVariable.incompleteStatement=Use Introduce Variable to quic
 refactoring.introduceVariable=Introduce Variable refactoring
 refactoring.rename=Rename
 refactoring.copyClass=Copy Class refactoring
+refactoring.extractMethod=Extract Method/Function
 ui.tree.speedsearch=Speed search in trees
 ui.scheme.quickswitch=Quickly switch scheme...
 ui.horizontal.scrolling=Horizontal scrolling
diff --git a/python/resources/ProductivityFeaturesRegistry.xml b/python/resources/ProductivityFeaturesRegistry.xml
index 6be234457744..2cf1968cc307 100644
--- a/python/resources/ProductivityFeaturesRegistry.xml
+++ b/python/resources/ProductivityFeaturesRegistry.xml
@@ -1,43 +1,4 @@
 <component>
-  <group id="codeassists">
-    <feature
-      id="codeassists.surroundwith.statement"
-      tip-id="SurroundWith"
-      first-show="5"
-      successive-show="5"
-      min-usage-count="4"
-      />
-    <!--
-    <feature
-      id="codeassists.surroundwith.expression"
-      tip-id="Surround"
-      first-show="6"
-      successive-show="5"
-      min-usage-count="3"
-      />
-    -->
-  </group>
-
-  <group id="refactoring">
-    <feature
-      id="refactoring.introduceVariable"
-      tip-id="IntroduceVariable"
-      min-usage-count="5"
-      first-show="1"
-      successive-show="3"
-      />
-
-    <feature
-      id="refactoring.rename"
-      tip-id="Rename"
-      min-usage-count="2"
-      first-show="1"
-      successive-show="3"
-      />
-
-  </group>
-
-
   <group id="ui">
     <feature
       id="ui.tree.speedsearch"