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

Fix double clicking on find result line not working

Browse Source 
"wstring::length()" returns less needed byte number because this methode consider 2 bytes character as 1 character, whereas "strlen(char*)" returns the total byte number in the char*.
Since SCI_ADDTEXT uses UTF8 char* as argument, it'll be more accurate to count the length (total byte number) with char* directly.

Fix #9009, fix #8525, close #9014
This commit is contained in:
Udo Hoffmann 2020-10-15 15:08:42 +02:00 committed by Don HO
parent 814ecd20df
commit ecab99b600
No known key found for this signature in database
GPG Key ID: 6C429F1D8D84F46E
1 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,6 +32,7 @@
#include "Notepad_plus_msgs.h" #include "Notepad_plus_msgs.h"
#include "UniConversion.h" #include "UniConversion.h"
#include "localization.h" #include "localization.h"
#include "Utf8.h"
using namespace std; using namespace std;
@ -2158,15 +2159,15 @@ int FindReplaceDlg::processRange(ProcessOperation op, FindReplaceInfo & findRepl
int nbChar = lend - lstart; int nbChar = lend - lstart;
// use the static buffer // use the static buffer
TCHAR lineBuf[1024]; TCHAR lineBuf[SC_SEARCHRESULT_LINEBUFFERMAXLENGTH];
if (nbChar > 1024 - 3) if (nbChar > SC_SEARCHRESULT_LINEBUFFERMAXLENGTH - 3)
lend = lstart + 1020; lend = lstart + SC_SEARCHRESULT_LINEBUFFERMAXLENGTH - 4;
int start_mark = targetStart - lstart; int start_mark = targetStart - lstart;
int end_mark = targetEnd - lstart; int end_mark = targetEnd - lstart;
pEditView->getGenericText(lineBuf, 1024, lstart, lend, &start_mark, &end_mark); pEditView->getGenericText(lineBuf, SC_SEARCHRESULT_LINEBUFFERMAXLENGTH, lstart, lend, &start_mark, &end_mark);
generic_string line = lineBuf; generic_string line = lineBuf;
line += TEXT("\r\n"); line += TEXT("\r\n");
@ -2191,15 +2192,15 @@ int FindReplaceDlg::processRange(ProcessOperation op, FindReplaceInfo & findRepl
int nbChar = lend - lstart; int nbChar = lend - lstart;
// use the static buffer // use the static buffer
TCHAR lineBuf[1024]; TCHAR lineBuf[SC_SEARCHRESULT_LINEBUFFERMAXLENGTH];
if (nbChar > 1024 - 3) if (nbChar > SC_SEARCHRESULT_LINEBUFFERMAXLENGTH - 3)
lend = lstart + 1020; lend = lstart + SC_SEARCHRESULT_LINEBUFFERMAXLENGTH - 4;
int start_mark = targetStart - lstart; int start_mark = targetStart - lstart;
int end_mark = targetEnd - lstart; int end_mark = targetEnd - lstart;
pEditView->getGenericText(lineBuf, 1024, lstart, lend, &start_mark, &end_mark); pEditView->getGenericText(lineBuf, SC_SEARCHRESULT_LINEBUFFERMAXLENGTH, lstart, lend, &start_mark, &end_mark);
generic_string line = lineBuf; generic_string line = lineBuf;
line += TEXT("\r\n"); line += TEXT("\r\n");
@ -3537,14 +3538,25 @@ void Finder::add(FoundInfo fi, SearchResultMarking mi, const TCHAR* foundline)
mi._end += static_cast<int32_t>(str.length()); mi._end += static_cast<int32_t>(str.length());
str += foundline; str += foundline;
if (str.length() >= SC_SEARCHRESULT_LINEBUFFERMAXLENGTH) WcharMbcsConvertor& wmc = WcharMbcsConvertor::getInstance();
const char *text2AddUtf8 = wmc.wchar2char(str.c_str(), SC_CP_UTF8, &mi._start, &mi._end); // certainly utf8 here
size_t len = strlen(text2AddUtf8);
if (len >= SC_SEARCHRESULT_LINEBUFFERMAXLENGTH)
{ {
const TCHAR * endOfLongLine = TEXT("...\r\n"); const char * endOfLongLine = " ...\r\n"; // perfectly Utf8-encoded already
str = str.substr(0, SC_SEARCHRESULT_LINEBUFFERMAXLENGTH - lstrlen(endOfLongLine) - 1); size_t lenEndOfLongLine = strlen(endOfLongLine);
str += endOfLongLine; size_t cut = SC_SEARCHRESULT_LINEBUFFERMAXLENGTH - lenEndOfLongLine - 1;
while ((cut > 0) && (!Utf8::isValid(& text2AddUtf8 [cut], (int)(len - cut))))
cut--;
memcpy ((void*) & text2AddUtf8 [cut], endOfLongLine, lenEndOfLongLine + 1);
len = cut + lenEndOfLongLine;
} }
setFinderReadOnly(false); setFinderReadOnly(false);
_scintView.addGenericText(str.c_str(), &mi._start, &mi._end); _scintView.execute(SCI_ADDTEXT, len, reinterpret_cast<LPARAM>(text2AddUtf8));
setFinderReadOnly(true); setFinderReadOnly(true);
_pMainMarkings->push_back(mi); _pMainMarkings->push_back(mi);
} }