Preserve Find All bookmarks on clicking inside editor area, issue #326.

zufuliu · May 13, 2021 · ce7a8d8 · ce7a8d8
1 parent d028d94
commit ce7a8d8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/Edit.c b/src/Edit.c
@@ -5752,8 +5752,12 @@ void EditMarkAll_ClearEx(int findFlag, Sci_Position iSelCount, LPSTR pszText) {
 		// clear existing indicator
 		SciCall_SetIndicatorCurrent(IndicatorNumber_MarkOccurrence);
 		SciCall_IndicatorClearRange(0, SciCall_GetLength());
+	}
+	if (editMarkAllStatus.bookmarkLine >= 0 || editMarkAllStatus.bookmarkForFindAll) {
 		if ((findFlag | editMarkAllStatus.findFlag) & NP2_MarkAllBookmark) {
-			SciCall_MarkerDeleteAll(MarkerNumber_Bookmark);
+			if ((findFlag & (NP2_MarkAllBookmark | NP2_FromFindAll)) != 0 || !editMarkAllStatus.bookmarkForFindAll) {
+				SciCall_MarkerDeleteAll(MarkerNumber_Bookmark);
+			}
 		}
 	}
 	if (editMarkAllStatus.pszText) {
@@ -5796,6 +5800,7 @@ BOOL EditMarkAll_Start(BOOL bChanged, int findFlag, Sci_Position iSelCount, LPST
 
 	//EditMarkAll_Runs = 0;
 	if (findFlag & NP2_MarkAllBookmark) {
+		editMarkAllStatus.bookmarkForFindAll = findFlag & NP2_FromFindAll;
 		Style_SetBookmark();
 	}
 	return EditMarkAll_Continue(&editMarkAllStatus, idleTaskTimer);
@@ -5995,7 +6000,8 @@ void EditFindAll(LPCEDITFINDREPLACE lpefr, BOOL selectAll) {
 	}
 
 	searchFlags |= (bFindReplaceFindAllBookmark * NP2_MarkAllBookmark)
-		| (selectAll * NP2_MarkAllSelectAll);
+		| (selectAll * NP2_MarkAllSelectAll)
+		| NP2_FromFindAll;
 	// rewind start position when transform backslash is checked,
 	// all other searching doesn't across lines.
 	// NOTE: complex fix is needed when multiline regex is supported.

diff --git a/src/Edit.h b/src/Edit.h
@@ -29,6 +29,7 @@
 #define NP2_MarkAllMultiline	0x00001000
 #define NP2_MarkAllBookmark		0x00002000
 #define NP2_MarkAllSelectAll	0x00004000
+#define NP2_FromFindAll			0x00008000
 
 typedef struct EDITFINDREPLACE {
 	char	szFind[512];
@@ -218,6 +219,7 @@ enum {
 typedef struct EditMarkAllStatus {
 	BOOL pending;
 	BOOL ignoreSelectionUpdate;
+	BOOL bookmarkForFindAll;
 	int findFlag;
 	int incrementSize;			// increment search size
 	Sci_Position iSelCount;		// length for pszText