Fix LangSet.hasLang() to compare against FcLangEqual instead of FcTrue (#9685)

FcLangSetHasLang returns FcLangResult enum values:
- FcLangEqual (0): Exact match
- FcLangDifferentTerritory (1): Same language, different territory
- FcLangDifferentLang (2): Different language
See also
https://www.freedesktop.org/software/fontconfig/fontconfig-devel/fclangsethaslang.html
and
https://codebrowser.dev/qt6/include/fontconfig/fontconfig.h.html#_FcLangResult

The previous comparison to FcTrue (1) caused:
- Exact matches (0) to incorrectly return false
- Partial matches (1) to incorrectly return true

This fix changes the comparison to FcLangEqual (0) so hasLang()
correctly returns true only for exact language matches.
pull/9688/head
Mitchell Hashimoto 2025-11-24 13:13:51 -08:00 committed by GitHub
commit 8278718c57
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 28 additions and 1 deletions

View File

@ -11,8 +11,12 @@ pub const LangSet = opaque {
c.FcLangSetDestroy(self.cval());
}
pub fn addLang(self: *LangSet, lang: [:0]const u8) bool {
return c.FcLangSetAdd(self.cval(), lang.ptr) == c.FcTrue;
}
pub fn hasLang(self: *const LangSet, lang: [:0]const u8) bool {
return c.FcLangSetHasLang(self.cvalConst(), lang.ptr) == c.FcTrue;
return c.FcLangSetHasLang(self.cvalConst(), lang.ptr) == c.FcLangEqual;
}
pub inline fn cval(self: *LangSet) *c.struct__FcLangSet {
@ -32,3 +36,26 @@ test "create" {
try testing.expect(!fs.hasLang("und-zsye"));
}
test "hasLang exact match" {
const testing = std.testing;
// Test exact match: langset with "en-US" should return true for "en-US"
var fs = LangSet.create();
defer fs.destroy();
try testing.expect(fs.addLang("en-US"));
try testing.expect(fs.hasLang("en-US"));
// Test exact match: langset with "und-zsye" should return true for "und-zsye"
var fs_emoji = LangSet.create();
defer fs_emoji.destroy();
try testing.expect(fs_emoji.addLang("und-zsye"));
try testing.expect(fs_emoji.hasLang("und-zsye"));
// Test mismatch: langset with "en-US" should return false for "fr"
try testing.expect(!fs.hasLang("fr"));
// Test partial match: langset with "en-US" should return false for "en-GB"
// (different territory, but we only want exact matches)
try testing.expect(!fs.hasLang("en-GB"));
}