Move incremental search to FindReplaceHandler

Author: KapiX

src/editor/Editor.cpp

@@ -31,7 +31,6 @@ Editor::Editor()
 	fSearchLastResult(-1, -1),
 	fSearchLast(""),
 	fSearchLastFlags(0),
-	fIncrementalSearch(false),
 	fNumberMarginEnabled(false),
 	fFoldMarginEnabled(false),
 	fBookmarkMarginEnabled(false),
@@ -482,63 +481,6 @@ Editor::ResetFindReplace()
 }
 
 
-/**
- * Works like Find(), except it's always case insensitive, looks forward and
- * includes the result in next search. It also saves selection in case the
- * search is cancelled. Search term is managed by the parent control/window.
- * After first call editor is put in incremental search mode so subsequent calls
- * do not reset saved selection.
- */
-void
-Editor::IncrementalSearch(std::string term)
-{
-	Sci::Guard<SearchTarget, SearchFlags> guard(this);
-
-	int length = SendMessage(SCI_GETLENGTH);
-	Sci_Position anchor = SendMessage(SCI_GETANCHOR);
-	Sci_Position current = SendMessage(SCI_GETCURRENTPOS);
-
-	if(fIncrementalSearch == false) {
-		fIncrementalSearch = true;
-		fSavedSelection = { anchor, current };
-	}
-
-	Sci_Position start = (anchor < current) ? anchor : current;
-	bool found;
-	found = _Find(term, start, length, false, false, false);
-
-	if(found == false) {
-		found = _Find(term, 0, start, false, false, false);
-	}
-	// nothing found
-	if(found == false) {
-		Set<Selection>(fSavedSelection);
-	}
-}
-
-
-void
-Editor::IncrementalSearchCancel()
-{
-	fIncrementalSearch = false;
-	Set<Selection>(fSavedSelection);
-}
-
-
-/**
- * Ends incremental search mode and sets up internal state so "Find next" works
- * correctly.
- */
-void
-Editor::IncrementalSearchCommit(std::string term)
-{
-	fIncrementalSearch = false;
-	fSearchLastMessage.MakeEmpty();
-	fSearchLastMessage.AddBool("wrapAround", true);
-	fSearchLastMessage.AddString("findText", term.c_str());
-}
-
-
 /**
  * Jumps to line maintaining distance from window edges - in other words swaps
  * the current line without changing caret position on the screen.

src/editor/Editor.h

@@ -83,9 +83,6 @@ class Editor : public BScintillaView {
 							bool regex = false);
 	void				ReplaceAndFind();
 	void				ResetFindReplace();
-	void				IncrementalSearch(std::string term);
-	void				IncrementalSearchCancel();
-	void				IncrementalSearchCommit(std::string term);
 
 	void				UpdateLineNumberWidth();
 
@@ -143,8 +140,6 @@ class Editor : public BScintillaView {
 	int					fSearchLastFlags;
 	bool				fNewSearch;
 	BMessage			fSearchLastMessage;
-	bool				fIncrementalSearch;
-	Scintilla::Range	fSavedSelection;
 
 	bool				fNumberMarginEnabled;
 	bool				fFoldMarginEnabled;

src/editor/EditorWindow.cpp

@@ -59,21 +59,9 @@ const float kWindowStagger = 17.0f;
 Preferences* EditorWindow::fPreferences = nullptr;
 
 
-namespace {
-	enum {
-		INCREMENTAL_SEARCH_CHAR			= 'incs',
-		INCREMENTAL_SEARCH_BACKSPACE	= 'incb',
-		INCREMENTAL_SEARCH_CANCEL		= 'ince',
-		INCREMENTAL_SEARCH_COMMIT		= 'incc'
-	};
-}
-
-
 EditorWindow::EditorWindow(bool stagger)
 	:
-	BWindow(fPreferences->fWindowRect, gAppName, B_DOCUMENT_WINDOW, 0),
-	fIncrementalSearchTerm(""),
-	fIncrementalSearchFilter(new BMessageFilter(B_KEY_DOWN, _IncrementalSearchFilter))
+	BWindow(fPreferences->fWindowRect, gAppName, B_DOCUMENT_WINDOW, 0)
 {
 	fActivatedGuard = false;
 
@@ -271,9 +259,9 @@ EditorWindow::EditorWindow(bool stagger)
 
 EditorWindow::~EditorWindow()
 {
-	delete fFindReplaceHandler;
+	RemoveCommonFilter(fFindReplaceHandler->IncrementalSearchFilter());
 
-	RemoveCommonFilter(fIncrementalSearchFilter.get());
+	delete fFindReplaceHandler;
 }
 
 
@@ -498,27 +486,6 @@ EditorWindow::MessageReceived(BMessage* message)
 	}
 
 	switch(message->what) {
-		case INCREMENTAL_SEARCH_CHAR: {
-			const char* character = message->GetString("character", "");
-			fIncrementalSearchTerm.append(character);
-			fEditor->IncrementalSearch(fIncrementalSearchTerm);
-		} break;
-		case INCREMENTAL_SEARCH_BACKSPACE: {
-			if(!fIncrementalSearchTerm.empty()) {
-				fIncrementalSearchTerm.pop_back();
-				fEditor->IncrementalSearch(fIncrementalSearchTerm);
-			}
-		} break;
-		case INCREMENTAL_SEARCH_CANCEL: {
-			fEditor->IncrementalSearchCancel();
-			fIncrementalSearchTerm = "";
-			RemoveCommonFilter(fIncrementalSearchFilter.get());
-		} break;
-		case INCREMENTAL_SEARCH_COMMIT: {
-			fEditor->IncrementalSearchCommit(fIncrementalSearchTerm);
-			fIncrementalSearchTerm = "";
-			RemoveCommonFilter(fIncrementalSearchFilter.get());
-		} break;
 		case SAVE_FILE: {
 			_Save();
 			message->SendReply((uint32) B_OK);
@@ -614,8 +581,8 @@ EditorWindow::MessageReceived(BMessage* message)
 			fEditor->ReplaceAndFind();
 		} break;
 		case MAINMENU_SEARCH_INCREMENTAL: {
-			RemoveCommonFilter(fIncrementalSearchFilter.get());
-			AddCommonFilter(fIncrementalSearchFilter.get());
+			RemoveCommonFilter(fFindReplaceHandler->IncrementalSearchFilter());
+			AddCommonFilter(fFindReplaceHandler->IncrementalSearchFilter());
 		} break;
 		case MAINMENU_SEARCH_BOOKMARKS: {
 			if(fBookmarksWindow == nullptr) {
@@ -1368,28 +1335,3 @@ EditorWindow::OnSavePoint(bool left)
 	fToolbar->SetActionEnabled(MAINMENU_FILE_RELOAD, fModified);
 	fToolbar->SetActionEnabled(MAINMENU_FILE_SAVE, fModified);
 }
-
-
-filter_result
-EditorWindow::_IncrementalSearchFilter(BMessage* message, BHandler** target,
-	BMessageFilter* messageFilter)
-{
-	if(message->what == B_KEY_DOWN) {
-		BLooper *looper = messageFilter->Looper();
-		const char* bytes;
-		message->FindString("bytes", &bytes);
-		if(bytes[0] == B_RETURN) {
-			looper->PostMessage(INCREMENTAL_SEARCH_COMMIT);
-		} else if(bytes[0] == B_ESCAPE) {
-			looper->PostMessage(INCREMENTAL_SEARCH_CANCEL);
-		} else if(bytes[0] == B_BACKSPACE) {
-			looper->PostMessage(INCREMENTAL_SEARCH_BACKSPACE);
-		} else {
-			BMessage msg(INCREMENTAL_SEARCH_CHAR);
-			msg.AddString("character", &bytes[0]);
-			messageFilter->Looper()->PostMessage(&msg);
-		}
-		return B_SKIP_MESSAGE;
-	}
-	return B_DISPATCH_MESSAGE;
-}

src/editor/EditorWindow.h

@@ -162,9 +162,6 @@ class EditorWindow : public BWindow {
 	static	Preferences*	fPreferences;
 			FilePreferences	fFilePreferences;
 
-			std::string			fIncrementalSearchTerm;
-			std::unique_ptr<BMessageFilter> fIncrementalSearchFilter;
-
 			void			_PopulateOpenRecentMenu();
 			void			_PopulateLanguageMenu();
 			void			_ReloadFile(entry_ref* ref = nullptr);
@@ -180,9 +177,6 @@ class EditorWindow : public BWindow {
 			void			_OpenTerminal(const char* path);
 
 			void			OnSavePoint(bool left);
-
-	static	filter_result	_IncrementalSearchFilter(BMessage* message,
-								BHandler** target, BMessageFilter* messageFilter);
 };
 
 

src/editor/FindReplaceHandler.cpp

@@ -6,7 +6,9 @@
 
 #include "FindReplaceHandler.h"
 
+#include <Looper.h>
 #include <Message.h>
+#include <MessageFilter.h>
 #include <Messenger.h>
 #include <ScintillaView.h>
 
@@ -25,6 +27,13 @@ FindReplaceHandler::FindReplaceHandler(BScintillaView* editor,
 	fSearchLast(""),
 	fSearchLastFlags(0)
 {
+	fIncrementalSearchFilter = new IncrementalSearchMessageFilter(this);
+}
+
+
+FindReplaceHandler::~FindReplaceHandler()
+{
+	delete fIncrementalSearchFilter;
 }
 
 
@@ -38,6 +47,26 @@ FindReplaceHandler::MessageReceived(BMessage* message)
 	const int length = fEditor->SendMessage(SCI_GETLENGTH);
 	const Sci_Position anchor = fEditor->SendMessage(SCI_GETANCHOR);
 	const Sci_Position current = fEditor->SendMessage(SCI_GETCURRENTPOS);
+
+	const auto incrementalSearch = [&]() {
+		if(fIncrementalSearch == false) {
+			fIncrementalSearch = true;
+			fSavedSelection = { anchor, current };
+		}
+		Sci_Position start = std::min(anchor, current);
+		Sci_Position pos = _Find(fIncrementalSearchTerm, start, length, false, false, false);
+
+		if(pos == -1) {
+			pos = _Find(fIncrementalSearchTerm, 0, start, false, false, false);
+		}
+
+		if(pos == -1) {
+			Set<Selection>(fSavedSelection);
+		} else {
+			Set<Selection>(Get<SearchTarget>());
+		}
+	};
+
 	switch(message->what) {
 		case REPLACEFIND:
 			// fallthrough
@@ -144,10 +173,68 @@ FindReplaceHandler::MessageReceived(BMessage* message)
 				message->SendReply(&reply, fReplyHandler);
 			}
 		} break;
+		case INCREMENTAL_SEARCH_CHAR: {
+			const char* character = message->GetString("character", "");
+			fIncrementalSearchTerm.append(character);
+			incrementalSearch();
+		} break;
+		case INCREMENTAL_SEARCH_BACKSPACE: {
+			if(!fIncrementalSearchTerm.empty()) {
+				fIncrementalSearchTerm.pop_back();
+				incrementalSearch();
+			}
+		} break;
+		case INCREMENTAL_SEARCH_CANCEL: {
+			fIncrementalSearch = false;
+			fIncrementalSearchTerm = "";
+			Set<Selection>(fSavedSelection);
+			Looper()->RemoveCommonFilter(fIncrementalSearchFilter);
+		} break;
+		case INCREMENTAL_SEARCH_COMMIT: {
+			fIncrementalSearch = false;
+			search_info si = {};
+			si.wrapAround = true;
+			si.find = fIncrementalSearchTerm;
+			fIncrementalSearchTerm = "";
+			Looper()->RemoveCommonFilter(fIncrementalSearchFilter);
+		} break;
+	}
+}
+
+
+FindReplaceHandler::IncrementalSearchMessageFilter::IncrementalSearchMessageFilter(BHandler* handler)
+	:
+	BMessageFilter(B_KEY_DOWN),
+	fHandler(handler)
+{
+}
+
+
+filter_result
+FindReplaceHandler::IncrementalSearchMessageFilter::Filter(BMessage* message, BHandler** target)
+{
+	if(message->what == B_KEY_DOWN) {
+		BLooper *looper = Looper();
+		const char* bytes;
+		message->FindString("bytes", &bytes);
+		if(bytes[0] == B_RETURN) {
+			looper->PostMessage(INCREMENTAL_SEARCH_COMMIT, fHandler);
+		} else if(bytes[0] == B_ESCAPE) {
+			looper->PostMessage(INCREMENTAL_SEARCH_CANCEL, fHandler);
+		} else if(bytes[0] == B_BACKSPACE) {
+			looper->PostMessage(INCREMENTAL_SEARCH_BACKSPACE, fHandler);
+		} else {
+			BMessage msg(INCREMENTAL_SEARCH_CHAR);
+			msg.AddString("character", &bytes[0]);
+			Looper()->PostMessage(&msg, fHandler);
+		}
+		return B_SKIP_MESSAGE;
 	}
+	return B_DISPATCH_MESSAGE;
 }
 
 
+
 Sci_Position
 FindReplaceHandler::_Find(std::string search, Sci_Position start,
 	Sci_Position end, bool matchCase, bool matchWord, bool regex)

src/editor/FindReplaceHandler.h

@@ -10,6 +10,7 @@
 
 #include <Handler.h>
 #include <Message.h>
+#include <MessageFilter.h>
 
 #include "ScintillaUtils.h"
 
@@ -27,9 +28,30 @@ class FindReplaceHandler : public BHandler {
 	};
 					FindReplaceHandler(BScintillaView* editor,
 						BHandler* replyHandler = nullptr);
+					~FindReplaceHandler();
 	virtual void	MessageReceived(BMessage* message);
 
+	BMessageFilter*	IncrementalSearchFilter() const { return fIncrementalSearchFilter; }
+
 private:
+	enum {
+		INCREMENTAL_SEARCH_CHAR			= 'incs',
+		INCREMENTAL_SEARCH_BACKSPACE	= 'incb',
+		INCREMENTAL_SEARCH_CANCEL		= 'ince',
+		INCREMENTAL_SEARCH_COMMIT		= 'incc'
+	};
+
+	class IncrementalSearchMessageFilter : public BMessageFilter
+	{
+	public:
+		IncrementalSearchMessageFilter(BHandler* handler);
+
+		virtual	filter_result	Filter(BMessage* message, BHandler** target);
+
+	private:
+		BHandler *fHandler;
+	};
+
 	struct search_info {
 		bool inSelection : 1;
 		bool matchCase : 1;
@@ -73,8 +95,11 @@ class FindReplaceHandler : public BHandler {
 	int					fSearchLastFlags;
 	bool				fNewSearch;
 	search_info			fSearchLastInfo;
+
 	bool				fIncrementalSearch;
+	std::string			fIncrementalSearchTerm;
 	Scintilla::Range	fSavedSelection;
+	BMessageFilter*		fIncrementalSearchFilter;
 };