Merge pull request #5 from justcla/RemoveMixEdit

Replaced MixEdit with SelectNextOccurrence
justcla · May 21, 2018 · 86a2f06 · 86a2f06
2 parents aad0825 + cec3eb4
commit 86a2f06
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 11 deletions.
diff --git a/SublimeVS/EmbeddedExtensions/Select_Next_Occurrence_v1.2.23.vsix b/SublimeVS/EmbeddedExtensions/Select_Next_Occurrence_v1.2.23.vsix
diff --git a/SublimeVS/Shortcuts/SublimeShortcuts.vssettings b/SublimeVS/Shortcuts/SublimeShortcuts.vssettings
@@ -32,9 +32,14 @@
           <Shortcut Command="Edit.Undo" Scope="Global">Ctrl+Z</Shortcut>
           <Shortcut Command="Edit.Redo" Scope="Global">Ctrl+Y</Shortcut>
           <Shortcut Command="Edit.GotoBrace" Scope="Text Editor">Ctrl+M</Shortcut>
-          <Shortcut Command="MixEdit.SelectWord" Scope="Text Editor">Ctrl+D</Shortcut>
-          <Shortcut Command="MixEdit.SplitSelectionAcrossLines" Scope="Text Editor">Ctrl+Shift+L</Shortcut>
-          <Shortcut Command="Edit.SelectCurrentWord" Scope="Text Editor">Ctrl+D</Shortcut>  <!-- Fallback in case MixEdit is not installed -->
+          <!-- Multi-caret selection shortcuts -->
+          <Shortcut Command="SelectNextOccurrence.SelectNextOccurrence" Scope="Text Editor">Ctrl+D</Shortcut>
+          <Shortcut Command="Edit.SelectCurrentWord" Scope="Text Editor">Ctrl+D</Shortcut>  <!-- Fallback in case SelectNextOccurrence is not installed -->
+          <Shortcut Command="SelectNextOccurrence.ConvertSelectionToMultipleCursors" Scope="Text Editor">Ctrl+Shift+L</Shortcut>
+          <Shortcut Command="SelectNextOccurrence.SelectAllOccurrences" Scope="Text Editor">Alt+F3</Shortcut>
+          <Shortcut Command="SelectNextOccurrence.UndoOccurrence" Scope="Text Editor">Ctrl+U</Shortcut>
+          <Shortcut Command="SelectNextOccurrence.SkipOccurrence" Scope="Text Editor">Ctrl+K,Ctrl+D</Shortcut>
+          <!-- Other shortcuts -->
           <Shortcut Command="Edit.Find" Scope="Text Editor">Ctrl+F</Shortcut>
           <Shortcut Command="Edit.IncrementalSearch" Scope="Text Editor">Ctrl+E</Shortcut>
           <Shortcut Command="Edit.FindinFiles" Scope="Global">Ctrl+Shift+F</Shortcut>

diff --git a/SublimeVS/SublimeVS.csproj b/SublimeVS/SublimeVS.csproj
@@ -68,9 +68,7 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
-    <Content Include="EmbeddedExtensions\MultiEditMode.vsix">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
+    <Content Include="EmbeddedExtensions\MultiEditMode.vsix" />
     <Content Include="EmbeddedExtensions\ZenCoding.vsix">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       <IncludeInVSIX>true</IncludeInVSIX>
@@ -112,15 +110,16 @@
       <ResourceName>Menus.ctmenu</ResourceName>
       <SubType>Designer</SubType>
     </VSCTCompile>
-    <Content Include="EmbeddedExtensions\MixEdit.vsix">
+    <Content Include="EmbeddedExtensions\MixEdit.vsix" />
+    <Content Include="EmbeddedExtensions\VSShortcutsManager.vsix">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
-    <Content Include="EmbeddedExtensions\VSShortcutsManager.vsix">
+    <Content Include="EmbeddedExtensions\WhackWhackTerminal.vsix">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
-    <Content Include="EmbeddedExtensions\WhackWhackTerminal.vsix">
+    <Content Include="EmbeddedExtensions\Select_Next_Occurrence_v1.2.23.vsix">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>

diff --git a/SublimeVS/source.extension.vsixmanifest b/SublimeVS/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="SublimeVS.7b1efb7d-cb70-46f9-a1aa-90b14f4a7b34" Version="1.0.4" Language="en-US" Publisher="Justin Clareburt" />
+        <Identity Id="SublimeVS.7b1efb7d-cb70-46f9-a1aa-90b14f4a7b34" Version="1.1.0" Language="en-US" Publisher="Justin Clareburt" />
         <DisplayName>SublimeVS</DisplayName>
         <Description xml:space="preserve">Provides some Sublime Text features in Visual Studio</Description>
         <ReleaseNotes>ReleaseNotes.txt</ReleaseNotes>
@@ -16,9 +16,9 @@
         <Dependency d:Source="File" DisplayName="EasyMotion" Id="5bb019ad-a18e-4c86-af3c-27217853df95" Version="[1.0.2,2.0.0.0)" d:InstallSource="Embed" Location="EmbeddedExtensions\EasyMotion.vsix" />
         <Dependency d:Source="File" DisplayName="ZenCoding" Id="9514d70e-a7b1-4876-847d-b0d2ad0962bf" Version="[1.2.11,2.0.0.0)" d:InstallSource="Embed" Location="EmbeddedExtensions\ZenCoding.vsix" />
         <Dependency d:Source="File" DisplayName="VSTricks" Id="37362471-59da-4a68-8288-f3d43648d490" Version="[1.9,2.0.0.0)" d:InstallSource="Embed" Location="EmbeddedExtensions\VSTricks.vsix" />
-        <Dependency d:Source="File" DisplayName="MixEdit" Id="cea4a802-b0ff-42bb-bc3a-344c79408279" Version="[1.1.68,2.0.0.0)" d:InstallSource="Embed" Location="EmbeddedExtensions\MixEdit.vsix" />
         <Dependency d:Source="File" DisplayName="VS Shortcuts Manager" Id="VSShortcutsManager.d8578b8b-cb70-49ee-b009-9e659c413f4b" Version="[1.0.0,2.0.0.0)" d:InstallSource="Embed" Location="EmbeddedExtensions\VSShortcutsManager.vsix" />
         <Dependency d:Source="File" DisplayName="Whack Whack Terminal" Id="WhackWhackTerminal.6f6b45b8-e50b-4d45-87f0-c304abf8ff0f" Version="[0.2.4,1.0.0.0)" d:InstallSource="Embed" Location="EmbeddedExtensions\WhackWhackTerminal.vsix" />
+        <Dependency d:Source="File" DisplayName="Select Next Occurrence" Id="NextOccurrence.b213c4e9-b96f-4f9d-b1d6-fa8bc7e9da21" Version="[1.2.23,)" d:InstallSource="Embed" Location="EmbeddedExtensions\Select_Next_Occurrence_v1.2.23.vsix" />
     </Dependencies>
     <Assets>
         <Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />