[v4.1.0] Added IntelliJ shortcuts for new VS commands - ToggleLineCom…

…ment and ToggleBlockComment.

(Uses Keyboard Manager 3.1.0)

HotKeysVSIX/HotKeysVSIX.csproj

@@ -48,7 +48,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="EmbeddedVSIX\KeyboardShortcutsManager-v3.0.0.vsix">
+    <Content Include="EmbeddedVSIX\KeyboardShortcutsManager-v3.1.0.vsix">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>

HotKeysVSIX/IntelliJ IDEA.vssettings

@@ -85,8 +85,14 @@
           <Shortcut Command="Edit.OverrideMethods" Scope="Text Editor">Ctrl+O</Shortcut>  <!-- NYI -->
           <Shortcut Command="Edit.ImplementMethods" Scope="Text Editor">Ctrl+I</Shortcut>  <!-- NYI -->
           <Shortcut Command="Edit.SurroundWith" Scope="Text Editor">Ctrl+Alt+T</Shortcut>
-          <Shortcut Command="Edit.ToggleComment" Scope="Text Editor">Ctrl+/</Shortcut>  <!-- NYI HotCommands.ToggleLineComment. Near-match. Should be ToggleLineComment -->
-          <Shortcut Command="Edit.ToggleBlockComment" Scope="Text Editor">Ctrl+Shift+/</Shortcut>  <!-- NYI -->
+          <!-- Comment/Uncomment -->
+          <Shortcut Command="Edit.ToggleLineComment" Scope="CSharp Editor">Ctrl+/</Shortcut>   <!-- Only implemented in C#. -->
+          <Shortcut Command="Edit.ToggleBlockComment" Scope="CSharp Editor">Ctrl+Shift+/</Shortcut>   <!-- Only implemented in C#. -->
+          <RemoveShortcut Command="Edit.ToggleBlockComment" Scope="Text Editor">Ctrl+Shift+/</RemoveShortcut>  <!-- ToggleBlockComment is no good outside C# scope. Don't let it block global commands on Ctrl+Shift+/ -->
+          <Shortcut Command="Edit.ToggleComment" Scope="Text Editor">Ctrl+/</Shortcut>  <!-- Use HotCommands.ToggleComment for all other Text Editor shortcuts - if it's enabled -->
+          <Shortcut Command="Edit.CommentSelection" Scope="Global">Ctrl+/</Shortcut>  <!-- Fallback: Use Ctrl+/ for comment when ToggleLineComment not available -->
+          <Shortcut Command="Edit.UncommentSelection" Scope="Global">Ctrl+Shift+/</Shortcut>  <!-- Fallback: Use Ctrl+Shift+/ for uncomment when ToggleBlockCommennt not available -->
+          <!-- More editing shortcuts -->
           <Shortcut Command="Edit.ExpandSelection" Scope="Text Editor">Ctrl+W</Shortcut>  <!-- Available VS2017 v15.5 -->
           <Shortcut Command="Edit.ContractSelection" Scope="Text Editor">Ctrl+Shift+W</Shortcut>  <!-- Available VS2017 v15.5 -->
           <Shortcut Command="Edit.IncreaseSelection" Scope="Text Editor">Ctrl+W</Shortcut>  <!-- Fallback to HotCommands.IncreaseSelection-->
@@ -110,6 +116,8 @@
           <Shortcut Command="Edit.CycleClipboardRing" Scope="Text Editor">Ctrl+Shift+V</Shortcut>
           <Shortcut Command="Edit.Duplicate" Scope="Text Editor">Ctrl+D</Shortcut>  <!-- Implemented in VS2017 v15.6 -->
           <Shortcut Command="Edit.DuplicateSelection" Scope="Text Editor">Ctrl+D</Shortcut>  <!-- Fallback to HotCommands for older versions of VS. -->
+          <Shortcut Command="Edit.Undo" Scope="Global">Ctrl+Z</Shortcut>
+          <Shortcut Command="Edit.Redo" Scope="Global">Ctrl+Shift+Z</Shortcut>
           <RemoveShortcut Command="Edit.Redo" Scope="Global">Ctrl+Y</RemoveShortcut>
           <Shortcut Command="Edit.LineDelete" Scope="Text Editor">Ctrl+Y</Shortcut>
           <Shortcut Command="Edit.JoinLines" Scope="Text Editor">Ctrl+Shift+J</Shortcut>  <!-- NYI Near match for Smart Join lines - Hot Commands Join Line -->

HotKeysVSIX/ReleaseNotes.txt

@@ -1,5 +1,6 @@
 Hot Keys - Keyboard Shortcuts
 by Justin Clareburt
+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
 23-Jan-2022: v3.1.0 New version created for VS2017-VS2019 legacy maintenance.
 12-Jul-2019: v3.0.0 Basic upgrade for VS2019 compatibility. Included KeyboardShortcutsManager-v2.1.0

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.0.0" Language="en-US" Publisher="Justin Clareburt" />
+        <Identity Id="HotKeys.e18a1a2b-78e5-4f4c-aade-448d36fd6016" Version="4.1.0" 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>
@@ -18,7 +18,7 @@
     <Dependencies>
         <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
         <Dependency Id="Microsoft.VisualStudio.MPF.15.0" DisplayName="Visual Studio MPF 15.0" d:Source="Installed" Version="[15.0]" />
-        <Dependency d:Source="File" Version="[3.0.0,4.0.0.0)" d:InstallSource="Embed" Location="EmbeddedVSIX\KeyboardShortcutsManager-v3.0.0.vsix" DisplayName="Keyboard Shortcuts Manager" Id="VSShortcutsManager.d8578b8b-cb70-49ee-b009-9e659c413f4b" />
+        <Dependency d:Source="File" Version="[3.1.0,4.0.0.0)" d:InstallSource="Embed" Location="EmbeddedVSIX\KeyboardShortcutsManager-v3.1.0.vsix" DisplayName="Keyboard Shortcuts Manager" Id="VSShortcutsManager.d8578b8b-cb70-49ee-b009-9e659c413f4b" />
     </Dependencies>
     <Prerequisites>
         <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,)" DisplayName="Visual Studio core editor" />