From 478e2d15cedaf609ef81a292476738797ff4e260 Mon Sep 17 00:00:00 2001
From: Justin Clareburt <justinclareburt@gmail.com>
Date: Fri, 23 Sep 2022 23:20:13 +0200
Subject: [PATCH] Updated shortcuts for OptimiseImports and FormatDocument

---
 HotKeysVSIX/IntelliJ IDEA.vssettings      | 3 ++-
 HotKeysVSIX/ReleaseNotes.txt              | 1 +
 HotKeysVSIX/source.extension.vsixmanifest | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/HotKeysVSIX/IntelliJ IDEA.vssettings b/HotKeysVSIX/IntelliJ IDEA.vssettings
index 2cb1246..f0e2190 100644
--- a/HotKeysVSIX/IntelliJ IDEA.vssettings	
+++ b/HotKeysVSIX/IntelliJ IDEA.vssettings	
@@ -103,7 +103,8 @@
           <!--Shortcut Command="Edit.FormatCode" Scope="Text Editor">Ctrl+Alt+L</Shortcut-->  <!-- HotCommands.FormatCode  IntelliJ: Reformat Code. Offers choice of selection/document where appropriate. -->
           <Shortcut Command="Edit.FormatDocument" Scope="Text Editor">Ctrl+Alt+L</Shortcut>  <!-- Near-match -->
           <Shortcut Command="Edit.FormatSelection" Scope="Text Editor">Ctrl+Shift+Alt+L</Shortcut>  <!-- Introduced shortcut! for Near-match -->
-          <Shortcut Command="EditorContextMenus.CodeWindow.OrganizeUsings.RemoveAndSort" Scope="Text Editor">Ctrl+Alt+O</Shortcut>  <!-- "OptimizeImports" -->
+          <Shortcut Command="Edit.RemoveAndSort" Scope="Text Editor">Ctrl+Alt+O</Shortcut>  <!-- "OptimizeImports" -->
+          <Shortcut Command="EditorContextMenus.CodeWindow.OrganizeUsings.RemoveAndSort" Scope="Text Editor">Ctrl+Alt+O</Shortcut>  <!-- Pre VS2022 -->
           <Shortcut Command="Edit.FormatIndents" Scope="Text Editor">Ctrl+Alt+I</Shortcut>  <!-- NYI [Auto-indent line(s)]-->
           <!--<Shortcut Command="Edit.IncreaseLineIndent" Scope="Text Editor">Tab</Shortcut>-->  <!-- Near-match. Not near enough to replace existing key behaviour -->
           <!--<Shortcut Command="Edit.DecreaseLineIndent" Scope="Text Editor">Shift+Tab</Shortcut>-->  <!-- Near-match. Not near enough to replace existing key behaviour -->
diff --git a/HotKeysVSIX/ReleaseNotes.txt b/HotKeysVSIX/ReleaseNotes.txt
index 9c1ef35..56553d1 100644
--- a/HotKeysVSIX/ReleaseNotes.txt
+++ b/HotKeysVSIX/ReleaseNotes.txt
@@ -1,5 +1,6 @@
 Hot Keys - Keyboard Shortcuts
 by Justin Clareburt
+23-Sep-2022: v4.2.1 Updated shortcuts for OptimiseImports and FormatDocument.
 05-Mar-2022: v4.2.0 Added new settings files for Camel-Hump navigation.
 05-Mar-2022: v4.1.0 Added shortcuts for new VS commands - ToggleLineComment and ToggleBlockComment. Uses Keyboard Manager 3.1.0
 19-Jan-2022: v4.0.0 Upgraded for VS2022+. Included KeyboardShortcutsManager-v3.0.0
diff --git a/HotKeysVSIX/source.extension.vsixmanifest b/HotKeysVSIX/source.extension.vsixmanifest
index 8ba7dd9..2243839 100644
--- a/HotKeysVSIX/source.extension.vsixmanifest
+++ b/HotKeysVSIX/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
     <Metadata>
-        <Identity Id="HotKeys.e18a1a2b-78e5-4f4c-aade-448d36fd6016" Version="4.2.0" Language="en-US" Publisher="Justin Clareburt" />
+        <Identity Id="HotKeys.e18a1a2b-78e5-4f4c-aade-448d36fd6016" Version="4.2.1" Language="en-US" Publisher="Justin Clareburt" />
         <DisplayName>Hot Keys - Keyboard Shortcuts</DisplayName>
         <Description xml:space="preserve">Installs alternative keyboard mapping schemes to work with Visual Studio.</Description>
         <MoreInfo>https://aka.ms/hotkeys2017</MoreInfo>