Fierelier/notepad-plus-plus-legacy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix false hit result in Find-in-Finder

Browse Source 
Fix #8435, close #8437
This commit is contained in:
Udo Hoffmann 2020-06-19 11:23:06 +02:00 committed by Don HO
parent f74e4ae159
commit a74877f262
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp
View File

@ -2081,7 +2081,7 @@ int FindReplaceDlg::processRange(ProcessOperation op, FindReplaceInfo & findRepl
int foundTextLen = targetEnd - targetStart; int foundTextLen = targetEnd - targetStart;
int replaceDelta = 0; int replaceDelta = 0;
bool processed = true;
switch (op) switch (op)
{ {
@ -2130,12 +2130,6 @@ int FindReplaceDlg::processRange(ProcessOperation op, FindReplaceInfo & findRepl
const TCHAR *pFileName = pFindersInfo->_pFileName ? pFindersInfo->_pFileName : TEXT(""); const TCHAR *pFileName = pFindersInfo->_pFileName ? pFindersInfo->_pFileName : TEXT("");
if (!findAllFileNameAdded) //add new filetitle in hits if we haven't already
{
pFindersInfo->_pDestFinder->addFileNameTitle(pFileName);
findAllFileNameAdded = true;
}
auto lineNumber = pEditView->execute(SCI_LINEFROMPOSITION, targetStart); auto lineNumber = pEditView->execute(SCI_LINEFROMPOSITION, targetStart);
int lend = static_cast<int32_t>(pEditView->execute(SCI_GETLINEENDPOSITION, lineNumber)); int lend = static_cast<int32_t>(pEditView->execute(SCI_GETLINEENDPOSITION, lineNumber));
int lstart = static_cast<int32_t>(pEditView->execute(SCI_POSITIONFROMLINE, lineNumber)); int lstart = static_cast<int32_t>(pEditView->execute(SCI_POSITIONFROMLINE, lineNumber));
@ -2157,14 +2151,14 @@ int FindReplaceDlg::processRange(ProcessOperation op, FindReplaceInfo & findRepl
SearchResultMarking srm; SearchResultMarking srm;
srm._start = start_mark; srm._start = start_mark;
srm._end = end_mark; srm._end = end_mark;
processed = (!pOptions->_isMatchLineNumber) || (pFindersInfo->_pSourceFinder->canFind(pFileName, lineNumber + 1));
if (pOptions->_isMatchLineNumber) if (processed)
{
if (pFindersInfo->_pSourceFinder->canFind(pFileName, lineNumber + 1))
pFindersInfo->_pDestFinder->add(FoundInfo(targetStart, targetEnd, lineNumber + 1, pFileName), srm, line.c_str());
}
else
{ {
if (!findAllFileNameAdded) //add new filetitle in hits if we haven't already
{
pFindersInfo->_pDestFinder->addFileNameTitle(pFileName);
findAllFileNameAdded = true;
}
pFindersInfo->_pDestFinder->add(FoundInfo(targetStart, targetEnd, lineNumber + 1, pFileName), srm, line.c_str()); pFindersInfo->_pDestFinder->add(FoundInfo(targetStart, targetEnd, lineNumber + 1, pFileName), srm, line.c_str());
} }
break; break;
@ -2257,7 +2251,7 @@ int FindReplaceDlg::processRange(ProcessOperation op, FindReplaceInfo & findRepl
} }
} }
++nbProcessed; if (processed) ++nbProcessed;
// After the processing of the last string occurrence the search loop should be stopped // After the processing of the last string occurrence the search loop should be stopped
// This helps to avoid the endless replacement during the EOL ("$") searching // This helps to avoid the endless replacement during the EOL ("$") searching