tyler.durden/notepad-plus-plus
1
0
Fork 0
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git synced 2025-07-24 22:34:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Make Find in Files Search Result line number aligned

Browse Source 
Fix #11119, close #11479
This commit is contained in:
wiseyestudio00 2022-04-05 22:46:05 -04:00 committed by Don Ho
parent 88ed851478
commit b4a58429c3
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,6 +20,7 @@
#include "ScintillaEditView.h" #include "ScintillaEditView.h"
#include "Notepad_plus_msgs.h" #include "Notepad_plus_msgs.h"
#include "localization.h" #include "localization.h"
#include "Common.h"
#include "Utf8.h" #include "Utf8.h"
using namespace std; using namespace std;
@ -2440,6 +2441,7 @@ int FindReplaceDlg::processRange(ProcessOperation op, FindReplaceInfo & findRepl
findAllFileNameAdded = true; findAllFileNameAdded = true;
} }
auto totalLineNumber = pEditView->execute(SCI_GETLINECOUNT);
auto lineNumber = pEditView->execute(SCI_LINEFROMPOSITION, targetStart); auto lineNumber = pEditView->execute(SCI_LINEFROMPOSITION, targetStart);
intptr_t lend = pEditView->execute(SCI_GETLINEENDPOSITION, lineNumber); intptr_t lend = pEditView->execute(SCI_GETLINEENDPOSITION, lineNumber);
intptr_t lstart = pEditView->execute(SCI_POSITIONFROMLINE, lineNumber); intptr_t lstart = pEditView->execute(SCI_POSITIONFROMLINE, lineNumber);
@ -2461,7 +2463,7 @@ int FindReplaceDlg::processRange(ProcessOperation op, FindReplaceInfo & findRepl
SearchResultMarking srm; SearchResultMarking srm;
srm._start = static_cast<long>(start_mark); srm._start = static_cast<long>(start_mark);
srm._end = static_cast<long>(end_mark); srm._end = static_cast<long>(end_mark);
_pFinder->add(FoundInfo(targetStart, targetEnd, lineNumber + 1, pFileName), srm, line.c_str()); _pFinder->add(FoundInfo(targetStart, targetEnd, lineNumber + 1, pFileName), srm, line.c_str(), totalLineNumber);
break; break;
} }
@ -2473,6 +2475,7 @@ int FindReplaceDlg::processRange(ProcessOperation op, FindReplaceInfo & findRepl
const TCHAR *pFileName = pFindersInfo->_pFileName ? pFindersInfo->_pFileName : TEXT(""); const TCHAR *pFileName = pFindersInfo->_pFileName ? pFindersInfo->_pFileName : TEXT("");
auto totalLineNumber = pEditView->execute(SCI_GETLINECOUNT);
auto lineNumber = pEditView->execute(SCI_LINEFROMPOSITION, targetStart); auto lineNumber = pEditView->execute(SCI_LINEFROMPOSITION, targetStart);
intptr_t lend = pEditView->execute(SCI_GETLINEENDPOSITION, lineNumber); intptr_t lend = pEditView->execute(SCI_GETLINEENDPOSITION, lineNumber);
intptr_t lstart = pEditView->execute(SCI_POSITIONFROMLINE, lineNumber); intptr_t lstart = pEditView->execute(SCI_POSITIONFROMLINE, lineNumber);
@ -2502,7 +2505,7 @@ int FindReplaceDlg::processRange(ProcessOperation op, FindReplaceInfo & findRepl
pFindersInfo->_pDestFinder->addFileNameTitle(pFileName); pFindersInfo->_pDestFinder->addFileNameTitle(pFileName);
findAllFileNameAdded = true; 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(), totalLineNumber);
} }
break; break;
} }
@ -4082,7 +4085,7 @@ void Finder::addSearchHitCount(int count, int countSearched, bool isMatchLines,
setFinderReadOnly(true); setFinderReadOnly(true);
} }
void Finder::add(FoundInfo fi, SearchResultMarking mi, const TCHAR* foundline) void Finder::add(FoundInfo fi, SearchResultMarking mi, const TCHAR* foundline, size_t totalLineNumber)
{ {
_pMainFoundInfos->push_back(fi); _pMainFoundInfos->push_back(fi);
@ -4090,7 +4093,13 @@ void Finder::add(FoundInfo fi, SearchResultMarking mi, const TCHAR* foundline)
str += _prefixLineStr; str += _prefixLineStr;
str += TEXT(" "); str += TEXT(" ");
str += std::to_wstring(fi._lineNumber); size_t totalLineNumberDigit = static_cast<size_t>(nbDigitsFromNbLines(totalLineNumber) + 1);
size_t currentLineNumberDigit = static_cast<size_t>(nbDigitsFromNbLines(fi._lineNumber) + 1);
generic_string lineNumberStr = TEXT("");
lineNumberStr.append(totalLineNumberDigit - currentLineNumberDigit, ' ');
lineNumberStr.append(std::to_wstring(fi._lineNumber));
str += lineNumberStr;
str += TEXT(": "); str += TEXT(": ");
mi._start += str.length(); mi._start += str.length();
mi._end += str.length(); mi._end += str.length();

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

@ -119,7 +119,7 @@ public:
void addFileNameTitle(const TCHAR * fileName); void addFileNameTitle(const TCHAR * fileName);
void addFileHitCount(int count); void addFileHitCount(int count);
void addSearchHitCount(int count, int countSearched, bool isMatchLines, bool searchedEntireNotSelection); void addSearchHitCount(int count, int countSearched, bool isMatchLines, bool searchedEntireNotSelection);
void add(FoundInfo fi, SearchResultMarking mi, const TCHAR* foundline); void add(FoundInfo fi, SearchResultMarking mi, const TCHAR* foundline, size_t totalLineNumber);
void setFinderStyle(); void setFinderStyle();
void removeAll(); void removeAll();
void openAll(); void openAll();