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

Improve character case handling in RegEx 

Fix #9636, close #9707
This commit is contained in:
Udo Hoffmann 2021-03-27 17:58:54 +01:00 committed by Don HO
parent 4cdd96f020
commit 86c66bba90
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scintilla/boostregex/BoostRegExSearch.cxx
View File

@ -304,10 +304,12 @@ Sci::Position BoostRegexSearch::FindText(Document* doc, Sci::Position startPosit
); );
search._skip_windows_line_end_as_one_character = (sciSearchFlags & SCFIND_REGEXP_SKIPCRLFASONE) != 0; search._skip_windows_line_end_as_one_character = (sciSearchFlags & SCFIND_REGEXP_SKIPCRLFASONE) != 0;
std::locale l = std::locale::global(std::locale(""));
Match match = Match match =
isUtf8 ? _utf8.FindText(search) isUtf8 ? _utf8.FindText(search)
: _ansi.FindText(search); : _ansi.FindText(search);
std::locale::global(l);
if (match.found()) if (match.found())
{ {
*lengthRet = match.length(); *lengthRet = match.length();
@ -414,7 +416,9 @@ void BoostRegexSearch::EncodingDependent<CharT, CharacterIterator>::compileRegex
{ {
if (_lastCompileFlags != compileFlags || _lastRegexString != regex) if (_lastCompileFlags != compileFlags || _lastRegexString != regex)
{ {
std::locale l = std::locale("");
_regex = Regex(CharTPtr(regex), static_cast<regex_constants::syntax_option_type>(compileFlags)); _regex = Regex(CharTPtr(regex), static_cast<regex_constants::syntax_option_type>(compileFlags));
std::locale::global(l);
_lastRegexString = regex; _lastRegexString = regex;
_lastCompileFlags = compileFlags; _lastCompileFlags = compileFlags;
} }
@ -444,9 +448,11 @@ bool BoostRegexSearch::SearchParameters::isLineEnd(Sci::Position position)
const char *BoostRegexSearch::SubstituteByPosition(Document* doc, const char *text, Sci::Position *length) { const char *BoostRegexSearch::SubstituteByPosition(Document* doc, const char *text, Sci::Position *length) {
delete[] _substituted; delete[] _substituted;
std::locale l = std::locale::global(std::locale(""));
_substituted = (doc->CodePage() == SC_CP_UTF8) _substituted = (doc->CodePage() == SC_CP_UTF8)
? _utf8.SubstituteByPosition(text, length) ? _utf8.SubstituteByPosition(text, length)
: _ansi.SubstituteByPosition(text, length); : _ansi.SubstituteByPosition(text, length);
std::locale::global(l);
return _substituted; return _substituted;
} }