From a9d050f5145f572542c986f1bcdcdf1c3514f1e9 Mon Sep 17 00:00:00 2001 From: Neil Date: Fri, 16 May 2025 11:47:33 +1000 Subject: Fix wrapping bug for UTF-8 where \r\n could wrap between the characters. https://github.com/notepad-plus-plus/notepad-plus-plus/pull/16373 --- src/Document.cxx | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/Document.cxx') diff --git a/src/Document.cxx b/src/Document.cxx index e6f8f3543..7dbe499a2 100644 --- a/src/Document.cxx +++ b/src/Document.cxx @@ -1314,10 +1314,16 @@ bool Scintilla::Internal::DiscardLastCombinedCharacter(std::string_view &text) n // Modified to move Sk (Symbol Modifier) from ccs-base to ccs-extend to preserve modified emoji // May break before and after Control which is defined as most of ccC? but not some of ccCf and ccCn // so treat ccCc, ccCs, ccCo as base for now. + // Treat \r\n as a single item to avoid separating the characters. std::string_view truncated = text; while (truncated.length() > UTF8MaxBytes) { // Give up when short + if (truncated.substr(truncated.length()-2) == "\r\n") { + truncated.remove_suffix(2); + text = truncated; + return true; + } const CharacterExtracted ce = LastCharacter(truncated); const CharacterCategory cc = CategoriseCharacter(static_cast(ce.character)); truncated.remove_suffix(ce.widthBytes); -- cgit v1.2.3