Keep selection intact when replacing in current selection, closes #1139.

Author: Meychi

External/Plugins/ProjectManager/Controls/OpenResourceForm.cs

@@ -210,7 +210,6 @@ private void OpenResourceFormActivated(Object sender, EventArgs e)
                 this.textBox.Focus();
                 this.textBox.Text = previousSearch;
                 this.textBox.SelectAll();
-                
                 this.UpdateOpenFiles();
                 this.textBox.Focus();
             }

FlashDevelop/Dialogs/FRInDocDialog.cs

@@ -1,18 +1,15 @@
 using System;
-using System.Text;
 using System.Drawing;
 using System.Windows.Forms;
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
 using PluginCore.Localization;
 using FlashDevelop.Utilities;
-using FlashDevelop.Helpers;
 using PluginCore.FRService;
 using PluginCore.Managers;
 using PluginCore.Controls;
 using PluginCore.Helpers;
 using ScintillaNet;
-using PluginCore;
 
 namespace FlashDevelop.Dialogs
 {
@@ -553,7 +550,8 @@ private void ReplaceAllButtonClick(Object sender, System.EventArgs e)
             if (Globals.SciControl == null) return;
             ScintillaControl sci = Globals.SciControl;
             List<SearchMatch> matches = this.GetResults(sci);
-            if (matches != null && this.lookComboBox.SelectedIndex == 1 && sci.SelText.Length > 0)
+            Boolean selectionOnly = this.lookComboBox.SelectedIndex == 1 && sci.SelText.Length > 0;
+            if (matches != null && selectionOnly)
             {
                 Int32 end = sci.MBSafeCharPosition(sci.SelectionEnd);
                 Int32 start = sci.MBSafeCharPosition(sci.SelectionStart);
@@ -566,11 +564,13 @@ private void ReplaceAllButtonClick(Object sender, System.EventArgs e)
                 {
                     for (Int32 i = 0; i < matches.Count; i++)
                     {
-                        FRDialogGenerics.SelectMatch(sci, matches[i]);
+                        if (!selectionOnly) FRDialogGenerics.SelectMatch(sci, matches[i]);
+                        else FRDialogGenerics.SelectMatchInTarget(sci, matches[i]);
                         String replaceWith = this.GetReplaceText(matches[i]);
                         FRSearch.PadIndexes(matches, i, matches[i].Value, replaceWith);
                         sci.EnsureVisible(sci.CurrentLine);
-                        sci.ReplaceSel(replaceWith);
+                        if (!selectionOnly) sci.ReplaceSel(replaceWith);
+                        else sci.ReplaceTarget(matches[i].Length, replaceWith);
                     }
                 }
                 finally

FlashDevelop/Utilities/FRDialogGenerics.cs

@@ -57,6 +57,19 @@ public static void SelectMatch(ScintillaControl sci, SearchMatch match)
             sci.SetSel(start, end);
         }
 
+        /// <summary>
+        /// Selects a search match in target
+        /// </summary>
+        public static void SelectMatchInTarget(ScintillaControl sci, SearchMatch match)
+        {
+            Int32 start = sci.MBSafePosition(match.Index); // wchar to byte position
+            Int32 end = start + sci.MBSafeTextLength(match.Value); // wchar to byte text length
+            Int32 line = sci.LineFromPosition(start);
+            sci.EnsureVisible(line);
+            sci.TargetStart = start;
+            sci.TargetEnd = end;
+        }
+
         /// <summary>
         /// Bookmarks a search match
         /// </summary>

PluginCore/ScintillaNet/ScintillaControl.cs

@@ -2475,8 +2475,7 @@ public void SmartSelectionDuplicate()
             bool wholeLine = SelectionStart == SelectionEnd;
             int selectionLength = SelectionEnd - SelectionStart;
             SelectionDuplicate();
-            if (wholeLine)
-                LineDown();
+            if (wholeLine) LineDown();
             else
             {
                 SelectionStart += selectionLength;