tyler.durden
/
notepad-plus-plus
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove obsolete logic with wholeword and MarkAll 

Fix #9803, close #9810
This commit is contained in:
Scott Sumner 2021-04-27 16:31:16 -04:00 committed by Don HO
parent 85aaef2fba
commit 8339de66d2
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PowerEditor/src/NppCommands.cpp
View File

@ -1267,12 +1267,12 @@ void Notepad_plus::command(int id)
{
if (lstrlen(wordOnCaret) > 0)
{
_findReplaceDlg.markAll(wordOnCaret, styleID, true);
_findReplaceDlg.markAll(wordOnCaret, styleID);
}
}
else
{
_findReplaceDlg.markAll(selectedText, styleID, lstrlen(selectedText) == lstrlen(wordOnCaret));
_findReplaceDlg.markAll(selectedText, styleID);
}
}
break;

8
PowerEditor/src/ScintillaComponent/FindReplaceDlg.cpp
View File

@ -2062,17 +2062,13 @@ bool FindReplaceDlg::processReplace(const TCHAR *txt2find, const TCHAR *txt2repl
int FindReplaceDlg::markAll(const TCHAR *txt2find, int styleID, bool isWholeWordSelected)
int FindReplaceDlg::markAll(const TCHAR *txt2find, int styleID)
{
const NppGUI& nppGUI = NppParameters::getInstance().getNppGUI();
FindOption markAllOpt;
markAllOpt._isMatchCase = nppGUI._markAllCaseSensitive;
// if whole word is selected for being colorized, isWholeWord setting in Preferences will be checked
// otherwise this option is false, because user may want to find the words contain the parts to search
markAllOpt._isWholeWord = isWholeWordSelected ? nppGUI._markAllWordOnly : false;
markAllOpt._isWholeWord = nppGUI._markAllWordOnly;
markAllOpt._str2Search = txt2find;
int nbFound = processAll(ProcessMarkAllExt, &markAllOpt, true, NULL, styleID);

2
PowerEditor/src/ScintillaComponent/FindReplaceDlg.h
View File

@ -249,7 +249,7 @@ public :
bool processFindNext(const TCHAR *txt2find, const FindOption *options = NULL, FindStatus *oFindStatus = NULL, FindNextType findNextType = FINDNEXTTYPE_FINDNEXT);
bool processReplace(const TCHAR *txt2find, const TCHAR *txt2replace, const FindOption *options = NULL);
int markAll(const TCHAR *txt2find, int styleID, bool isWholeWordSelected);
int markAll(const TCHAR *txt2find, int styleID);
int markAllInc(const FindOption *opt);