Rename undo selection action

platform/lang-impl/src/com/intellij/openapi/editor/actions/SelectNextOccurrenceAction.java

@@ -23,11 +23,11 @@ import com.intellij.find.FindBundle;
 import com.intellij.find.FindManager;
 import com.intellij.find.FindModel;
 import com.intellij.find.FindResult;
-import com.intellij.openapi.editor.EditorLastActionTracker;
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.actionSystem.IdeActions;
 import com.intellij.openapi.editor.Caret;
 import com.intellij.openapi.editor.Editor;
+import com.intellij.openapi.editor.EditorLastActionTracker;
 import com.intellij.openapi.editor.ScrollType;
 import com.intellij.openapi.editor.actionSystem.EditorAction;
 import com.intellij.openapi.editor.actionSystem.EditorActionHandler;
@@ -145,7 +145,7 @@ public class SelectNextOccurrenceAction extends EditorAction {
 
     private static boolean isRepeatedActionInvocation() {
       String lastActionId = EditorLastActionTracker.getInstance().getLastActionId();
-      return IdeActions.ACTION_SELECT_NEXT_OCCURENCE.equals(lastActionId) || IdeActions.ACTION_UNSELECT_LAST_OCCURENCE.equals(lastActionId);
+      return IdeActions.ACTION_SELECT_NEXT_OCCURENCE.equals(lastActionId) || IdeActions.ACTION_UNSELECT_PREVIOUS_OCCURENCE.equals(lastActionId);
     }
   }
 }

platform/lang-impl/src/com/intellij/openapi/editor/actions/UnselectPreviousOccurrenceAction.java

@@ -23,8 +23,8 @@ import com.intellij.openapi.editor.actionSystem.EditorAction;
 import com.intellij.openapi.editor.actionSystem.EditorActionHandler;
 import org.jetbrains.annotations.Nullable;
 
-public class UnselectLastOccurrenceAction extends EditorAction {
-  protected UnselectLastOccurrenceAction() {
+public class UnselectPreviousOccurrenceAction extends EditorAction {
+  protected UnselectPreviousOccurrenceAction() {
     super(new Handler());
   }
 

platform/platform-api/src/com/intellij/openapi/actionSystem/IdeActions.java

@@ -115,7 +115,7 @@ public interface IdeActions {
   @NonNls String ACTION_FIND_NEXT = "FindNext";
   @NonNls String ACTION_FIND_PREVIOUS = "FindPrevious";
   @NonNls String ACTION_SELECT_NEXT_OCCURENCE = "SelectNextOccurrence";
-  @NonNls String ACTION_UNSELECT_LAST_OCCURENCE = "UnselectLastOccurrence";
+  @NonNls String ACTION_UNSELECT_PREVIOUS_OCCURENCE = "UnselectPreviousOccurrence";
   @NonNls String ACTION_COMPILE = "Compile";
   @NonNls String ACTION_COMPILE_PROJECT = "CompileProject";
   @NonNls String ACTION_MAKE_MODULE = "MakeModule";

platform/platform-resources-en/src/messages/ActionsBundle.properties

@@ -108,7 +108,7 @@ action.EditorMoveDownAndScrollWithSelection.text=Move Down and Scroll with Selec
 action.EditorCloneCaretBelow.text=Clone Caret Below
 action.EditorCloneCaretAbove.text=Clone Caret Above
 action.SelectNextOccurrence.text=Select Next Occurrence
-action.UnselectLastOccurrence.text=Unselect Last Occurrence
+action.UnselectPreviousOccurrence.text=Unselect Occurrence
 action.EditorToggleStickySelection.text=Toggle Sticky Selection
 action.EditorSwapSelectionBoundaries.text=Swap selection boundaries
 action.EditorLineStart.text=Move Caret to Line Start

platform/platform-resources/src/idea/Keymap_Default.xml

@@ -115,7 +115,7 @@
   <action id="SelectNextOccurrence">
     <keyboard-shortcut first-keystroke="alt J"/>
   </action>
-  <action id="UnselectLastOccurrence">
+  <action id="UnselectPreviousOccurrence">
     <keyboard-shortcut first-keystroke="alt shift J"/>
   </action>
   <action id="GotoDeclaration">

platform/platform-resources/src/idea/Keymap_Eclipse.xml

@@ -124,7 +124,7 @@
     <action id="SelectNextOccurrence">
       <keyboard-shortcut first-keystroke="alt Y"/>
     </action>
-    <action id="UnselectLastOccurrence">
+    <action id="UnselectPreviousOccurrence">
       <keyboard-shortcut first-keystroke="alt shift Y"/>
     </action>
     <action id="FindUsages">

platform/platform-resources/src/idea/Keymap_Mac.xml

@@ -353,7 +353,7 @@
     <action id="SelectNextOccurrence">
       <keyboard-shortcut first-keystroke="control G"/>
     </action>
-    <action id="UnselectLastOccurrence">
+    <action id="UnselectPreviousOccurrence">
       <keyboard-shortcut first-keystroke="control shift G"/>
     </action>
 

platform/platform-resources/src/idea/Keymap_MacClassic.xml

@@ -262,7 +262,7 @@
     <action id="SelectNextOccurrence">
       <keyboard-shortcut first-keystroke="control G"/>
     </action>
-    <action id="UnselectLastOccurrence">
+    <action id="UnselectPreviousOccurrence">
       <keyboard-shortcut first-keystroke="control shift G"/>
     </action>
 

platform/platform-resources/src/idea/PlatformActions.xml

@@ -226,7 +226,7 @@
           <action id="FindPrevious" class="com.intellij.ide.actions.SearchBackAction"/>
           <action id="FindWordAtCaret" class="com.intellij.openapi.editor.actions.FindWordAtCaretAction"/>
           <action id="SelectNextOccurrence" class="com.intellij.openapi.editor.actions.SelectNextOccurrenceAction"/>
-          <action id="UnselectLastOccurrence" class="com.intellij.openapi.editor.actions.UnselectLastOccurrenceAction"/>
+          <action id="UnselectPreviousOccurrence" class="com.intellij.openapi.editor.actions.UnselectPreviousOccurrenceAction"/>
           <separator/>
           <action id="FindInPath" class="com.intellij.find.actions.FindInPathAction"/>
           <action id="ReplaceInPath" class="com.intellij.find.actions.ReplaceInPathAction"/>

platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/SelectUnselectOccurrenceActionsTest.java

@@ -182,6 +182,6 @@ public class SelectUnselectOccurrenceActionsTest extends LightPlatformCodeInsigh
   }
 
   private void executeReverseAction() {
-    myFixture.performEditorAction(IdeActions.ACTION_UNSELECT_LAST_OCCURENCE);
+    myFixture.performEditorAction(IdeActions.ACTION_UNSELECT_PREVIOUS_OCCURENCE);
   }
 }