Sync with vs-editor-core@a4e52041

3 files changed, 28 insertions, 1 deletions

diff --git a/Directory.Build.props b/Directory.Build.props
index 634682d..ad68f50 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -25,9 +25,15 @@
 
   <PropertyGroup>
     <InMonoDevelopTree Condition="Exists('$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), MonoDevelop.props))')">true</InMonoDevelopTree>
+    <InMdAddinsTree Condition="Exists('$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), md-addins.sln))')">true</InMdAddinsTree>
+    <MonoDevelopDirectory Condition="$(InMonoDevelopTree) == 'true'">$(MSBuildThisFileDirectory)..\..\..\</MonoDevelopDirectory>
+    <MonoDevelopDirectory Condition="$(InMdAddinsTree) == 'true'">$(MSBuildThisFileDirectory)..\..\..\monodevelop\</MonoDevelopDirectory>
     <UsePlatformEditorBinaries Condition="$(OS) == 'Windows_NT' AND $(InMonoDevelopTree) == 'true'">true</UsePlatformEditorBinaries>
   </PropertyGroup>
 
+  <!-- Override Roslyn versions if in IDE build -->
+  <Import Condition="'$(MonoDevelopDirectory)' != ''" Project="$(MonoDevelopDirectory)main\msbuild\RoslynVersion.props"/>
+
   <Import Project="$(RepoRootPath)build\Environment.props"/>
   <Import Project="$(RepoRootPath)build\CI.props"/>
 
diff --git a/src/Editor/Text/Def/Extras/Find/FindCommandArgs.cs b/src/Editor/Text/Def/Extras/Find/FindCommandArgs.cs
index 2bfe806..e605417 100644
--- a/src/Editor/Text/Def/Extras/Find/FindCommandArgs.cs
+++ b/src/Editor/Text/Def/Extras/Find/FindCommandArgs.cs
@@ -19,6 +19,13 @@ namespace Microsoft.VisualStudio.Text.Editor.Commanding.Commands
         }
     }
 
+    public sealed class FindNextLikeSelectionCommandArgs : EditorCommandArgs
+    {
+        public FindNextLikeSelectionCommandArgs(ITextView textView, ITextBuffer subjectBuffer) : base(textView, subjectBuffer)
+        {
+        }
+    }
+
     public sealed class FindPreviousCommandArgs : EditorCommandArgs
     {
         public FindPreviousCommandArgs(ITextView textView, ITextBuffer subjectBuffer) : base(textView, subjectBuffer)
@@ -26,6 +33,13 @@ namespace Microsoft.VisualStudio.Text.Editor.Commanding.Commands
         }
     }
 
+    public sealed class FindPreviousLikeSelectionCommandArgs : EditorCommandArgs
+    {
+        public FindPreviousLikeSelectionCommandArgs(ITextView textView, ITextBuffer subjectBuffer) : base(textView, subjectBuffer)
+        {
+        }
+    }
+
     public sealed class ReplaceCommandArgs : EditorCommandArgs
     {
         public ReplaceCommandArgs(ITextView textView, ITextBuffer subjectBuffer) : base(textView, subjectBuffer)
@@ -81,4 +95,11 @@ namespace Microsoft.VisualStudio.Text.Editor.Commanding.Commands
         {
         }
     }
+
+    public sealed class SetSearchStringFromSelectionCommandArgs : EditorCommandArgs
+    {
+        public SetSearchStringFromSelectionCommandArgs(ITextView textView, ITextBuffer subjectBuffer) : base(textView, subjectBuffer)
+        {
+        }
+    }
 }
diff --git a/src/Editor/Text/Def/TextUI/Commanding/CommandSelector.cs b/src/Editor/Text/Def/TextUI/Commanding/CommandSelector.cs
index 343d261..91e2050 100644
--- a/src/Editor/Text/Def/TextUI/Commanding/CommandSelector.cs
+++ b/src/Editor/Text/Def/TextUI/Commanding/CommandSelector.cs
@@ -195,7 +195,7 @@ namespace Microsoft.VisualStudio.Text.Editor.Commanding
         /// <summary>⇧fn⇡, ⇧⇞</summary>
         public const string PageUpAndModifySelection = "pageUpAndModifySelection:";
 
-        /// <summary>⌘F, ⌥⌘F, ⌘G, ⌥⌘G</summary>
+        /// <summary>⌘F, ⌥⌘F, ⌘G, ⌥⌘G, ⌘E</summary>
         public const string PerformTextFinderAction = "performTextFinderAction:";
 
         /// <summary>fn⇡, ⇞</summary>