CodeCow/Notepad3
1
0
Fork 0
mirror of https://github.com/rizonesoft/Notepad3.git synced 2026-06-14 21:09:05 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #5617 from RaiKoHoff/Dev_Master

Browse Source 
fix: consistent simple encoding detection if UCHARDET is skipped or uncertain.
This commit is contained in:
Rainer Kottenhoff 2026-03-27 11:17:48 +01:00 committed by GitHub
commit 407170842e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/EncodingDetection.cpp
View File

@ -1211,10 +1211,18 @@ static void _SetResultingEncoding(ENC_DET_T* encDetRes, bool bBOM_LE, bool bBOM_
else
encDetRes->Encoding = encDetRes->unicodeAnalysis;
}
else if (encDetRes->bPureASCII7Bit) {
// pure ASCII (no null bytes, all 0x01-0x7F) always valid UTF-8
else if (encDetRes->bValidUTF8 && !encDetRes->bPureASCII7Bit) {
// Non-ASCII data where all bytes form valid UTF-8 multi-byte sequences.
// When UCHARDET was skipped or returned unreliable results, valid
// multi-byte UTF-8 is a strong structural signal — prefer UTF-8 over
// blind ANSI fallback.
encDetRes->Encoding = CPI_UTF8;
}
else if (encDetRes->bPureASCII7Bit) {
// pure ASCII (no null bytes, all 0x01-0x7F) — treat as UTF-8 or ANSI
// depending on user preference
encDetRes->Encoding = Settings.LoadASCIIasUTF8 ? CPI_UTF8 : CPI_ANSI_DEFAULT;
}
else if (encDetRes->bHasNullBytes) {
// Data contains null bytes — not a valid single-byte encoding.
// Both Unicode detectors (IsTextUnicode and null-distribution) already
@ -1235,9 +1243,13 @@ static void _SetResultingEncoding(ENC_DET_T* encDetRes, bool bBOM_LE, bool bBOM_
}
}
// Final fallback: if no encoding could be determined, treat as binary via ANSI codepage
// Final fallback: use preferred encoding if configured, otherwise system ANSI codepage
if (Encoding_IsNONE(encDetRes->Encoding)) {
encDetRes->Encoding = CPI_ANSI_DEFAULT;
if (Settings.UseDefaultForFileEncoding && Encoding_IsValid(Settings.DefaultEncoding)) {
encDetRes->Encoding = Settings.DefaultEncoding;
} else {
encDetRes->Encoding = CPI_ANSI_DEFAULT;
}
}
}