fix merge conflict

src/dlangide/ui/frame.d

@@ -986,6 +986,8 @@ class IDEFrame : AppFrame, ProgramExecutionStatusListener, BreakpointListChangeL
                     _logPanel.getTabs.selectTab("search");
                     if(searchPanel !is null) { 
                         searchPanel.focus();
+                        dstring selectedText = currentEditor.getSelectedText();
+                        searchPanel.setSearchText(selectedText);
                     }
                     return true;
                 case IDEActions.FileNewWorkspace:

src/dlangide/ui/searchPanel.d

@@ -170,6 +170,10 @@ class SearchWidget : TabWidget {
         }
         return true;
     }
+    
+    public void setSearchText(dstring txt){
+        _findText.text = txt;
+    }
 
     protected bool onEditorAction(const Action action) {
         if (action.id == EditorActions.InsertNewLine) {