Use FindReplaceHandler for Search menu actions

Author: KapiX

src/editor/EditorWindow.cpp

@@ -572,13 +572,19 @@ EditorWindow::MessageReceived(BMessage* message)
 			be_app->PostMessage(message);
 		} break;
 		case MAINMENU_SEARCH_FINDNEXT: {
-			fEditor->FindNext();
+			PostMessage(FindReplaceHandler::FIND, fFindReplaceHandler, this);
 		} break;
 		case MAINMENU_SEARCH_FINDSELECTION: {
-			fEditor->FindSelection();
+			std::string selection = fEditor->SelectionText();
+			if(!selection.empty()) {
+				BMessage msg(FindReplaceHandler::FIND);
+				msg.AddBool("wrapAround", true);
+				msg.AddString("findText", selection.c_str());
+				PostMessage(&msg, fFindReplaceHandler, this);
+			}
 		} break;
 		case MAINMENU_SEARCH_REPLACEANDFIND: {
-			fEditor->ReplaceAndFind();
+			PostMessage(FindReplaceHandler::REPLACEFIND, fFindReplaceHandler, this);
 		} break;
 		case MAINMENU_SEARCH_INCREMENTAL: {
 			RemoveCommonFilter(fFindReplaceHandler->IncrementalSearchFilter());

src/editor/FindReplaceHandler.cpp

@@ -69,6 +69,9 @@ FindReplaceHandler::MessageReceived(BMessage* message)
 
 	switch(message->what) {
 		case REPLACEFIND:
+			if(info.replace.empty() && info.find.empty()) {
+				info.replace = fSearchLastInfo.replace;
+			}
 			// fallthrough
 		case REPLACE: {
 			int replaceMsg = (info.regex ? SCI_REPLACETARGETRE : SCI_REPLACETARGET);
@@ -90,6 +93,9 @@ FindReplaceHandler::MessageReceived(BMessage* message)
 		}
 		if(message->what != REPLACEFIND) break;
 		case FIND: {
+			if(info.find.empty()) {
+				info = fSearchLastInfo;
+			}
 			if((fSearchLastInfo.backwards == true && (anchor != fSearchLastResult.first
 					|| current != fSearchLastResult.second))
 				|| (fSearchLastInfo.backwards == false && (anchor != fSearchLastResult.second