#2584 StyleText find/replace support

Former-commit-id: 185aebcc

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/UIUtils.java

@@ -29,6 +29,7 @@ import org.eclipse.jface.resource.ColorRegistry;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.resource.JFaceResources;
 import org.eclipse.jface.resource.StringConverter;
+import org.eclipse.jface.text.IFindReplaceTarget;
 import org.eclipse.jface.viewers.CellEditor;
 import org.eclipse.jface.viewers.ISelectionProvider;
 import org.eclipse.jface.window.IShellProvider;
@@ -51,6 +52,7 @@ import org.eclipse.ui.handlers.IHandlerService;
 import org.eclipse.ui.services.IServiceLocator;
 import org.eclipse.ui.swt.IFocusService;
 import org.eclipse.ui.texteditor.AbstractTextEditor;
+import org.eclipse.ui.texteditor.FindReplaceAction;
 import org.jkiss.code.NotNull;
 import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.Log;
@@ -79,10 +81,7 @@ import java.lang.reflect.Method;
 import java.nio.charset.Charset;
 import java.text.DecimalFormatSymbols;
 import java.text.MessageFormat;
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.Locale;
-import java.util.SortedMap;
+import java.util.*;
 
 /**
  * UI Utils
@@ -1311,6 +1310,12 @@ public class UIUtils {
         menu.add(new StyledTextAction(IWorkbenchCommandConstants.EDIT_PASTE, text.getEditable(), text, ST.PASTE));
         menu.add(new StyledTextAction(IWorkbenchCommandConstants.EDIT_CUT, selectionRange.y > 0, text, ST.CUT));
         menu.add(new StyledTextAction(IWorkbenchCommandConstants.EDIT_SELECT_ALL, true, text, ST.SELECT_ALL));
+        IFindReplaceTarget stFindReplaceTarget = new StyledTextFindReplaceTarget(text);
+        menu.add(new FindReplaceAction(
+            ResourceBundle.getBundle("org.eclipse.ui.texteditor.ConstructedEditorMessages"),
+            "Editor.FindReplace.",
+            text.getShell(),
+            stFindReplaceTarget));
         menu.add(new GroupMarker("styled_text_additions"));
     }
 

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/StyledTextFindReplaceTarget.java

@@ -60,7 +60,10 @@ public class StyledTextFindReplaceTarget implements IFindReplaceTarget, IFindRep
     @Override
     public Point getSelection()
     {
-        return text.getSelection();
+        Point selection = text.getSelection();
+        // fix selection
+        selection.y = selection.y - selection.x;
+        return selection;
     }
 
     @Override