godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #71923 from bruvzg/icu_fb

Browse Source 
[TextServer] Add fallback code in case of missing ICU data.
This commit is contained in:
Rémi Verschelde 2023-01-23 20:10:43 +01:00
commit 6efd5f0b5b
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
modules/text_server_adv/text_server_adv.cpp
View File

@ -6114,6 +6114,11 @@ String TextServerAdvanced::_percent_sign(const String &p_language) const {
} }
int64_t TextServerAdvanced::_is_confusable(const String &p_string, const PackedStringArray &p_dict) const { int64_t TextServerAdvanced::_is_confusable(const String &p_string, const PackedStringArray &p_dict) const {
#ifndef ICU_STATIC_DATA
if (!icu_data_loaded) {
return -1;
}
#endif
UErrorCode status = U_ZERO_ERROR; UErrorCode status = U_ZERO_ERROR;
int64_t match_index = -1; int64_t match_index = -1;
@ -6154,6 +6159,11 @@ int64_t TextServerAdvanced::_is_confusable(const String &p_string, const PackedS
} }
bool TextServerAdvanced::_spoof_check(const String &p_string) const { bool TextServerAdvanced::_spoof_check(const String &p_string) const {
#ifndef ICU_STATIC_DATA
if (!icu_data_loaded) {
return false;
}
#endif
UErrorCode status = U_ZERO_ERROR; UErrorCode status = U_ZERO_ERROR;
Char16String utf16 = p_string.utf16(); Char16String utf16 = p_string.utf16();
@ -6176,6 +6186,11 @@ bool TextServerAdvanced::_spoof_check(const String &p_string) const {
} }
String TextServerAdvanced::_strip_diacritics(const String &p_string) const { String TextServerAdvanced::_strip_diacritics(const String &p_string) const {
#ifndef ICU_STATIC_DATA
if (!icu_data_loaded) {
return TextServer::strip_diacritics(p_string);
}
#endif
UErrorCode err = U_ZERO_ERROR; UErrorCode err = U_ZERO_ERROR;
// Get NFKD normalizer singleton. // Get NFKD normalizer singleton.
@ -6213,6 +6228,12 @@ String TextServerAdvanced::_strip_diacritics(const String &p_string) const {
} }
String TextServerAdvanced::_string_to_upper(const String &p_string, const String &p_language) const { String TextServerAdvanced::_string_to_upper(const String &p_string, const String &p_language) const {
#ifndef ICU_STATIC_DATA
if (!icu_data_loaded) {
return p_string.to_upper();
}
#endif
if (p_string.is_empty()) { if (p_string.is_empty()) {
return p_string; return p_string;
} }
@ -6235,6 +6256,12 @@ String TextServerAdvanced::_string_to_upper(const String &p_string, const String
} }
String TextServerAdvanced::_string_to_lower(const String &p_string, const String &p_language) const { String TextServerAdvanced::_string_to_lower(const String &p_string, const String &p_language) const {
#ifndef ICU_STATIC_DATA
if (!icu_data_loaded) {
return p_string.to_lower();
}
#endif
if (p_string.is_empty()) { if (p_string.is_empty()) {
return p_string; return p_string;
} }
@ -6270,8 +6297,8 @@ PackedInt32Array TextServerAdvanced::_string_get_word_breaks(const String &p_str
breaks.insert(pos); breaks.insert(pos);
} }
} }
ubrk_close(bi);
} }
ubrk_close(bi);
PackedInt32Array ret; PackedInt32Array ret;
@ -6352,6 +6379,13 @@ PackedInt32Array TextServerAdvanced::_string_get_word_breaks(const String &p_str
} }
bool TextServerAdvanced::_is_valid_identifier(const String &p_string) const { bool TextServerAdvanced::_is_valid_identifier(const String &p_string) const {
#ifndef ICU_STATIC_DATA
if (!icu_data_loaded) {
WARN_PRINT_ONCE("ICU data is not loaded, Unicode security and spoofing detection disabled.");
return TextServer::is_valid_identifier(p_string);
}
#endif
enum UAX31SequenceStatus { enum UAX31SequenceStatus {
SEQ_NOT_STARTED, SEQ_NOT_STARTED,
SEQ_STARTED, SEQ_STARTED,