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

Merge pull request #79202 from MewPurPur/fix-pad-zeros-error 

Fix erroneous `pad_zeros()` warning
This commit is contained in:
Rémi Verschelde 2023-07-08 18:23:53 +02:00
parent 8eeb7c9061 cc5500f7de
commit 83cc5d4914
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/string/ustring.cpp
View File

@ -4281,12 +4281,13 @@ String String::pad_zeros(int p_digits) const {
begin++;
}
if (begin >= end) {
return s;
}
int zeros_to_add = p_digits - (end - begin);
return s.insert(begin, String("0").repeat(zeros_to_add));
if (zeros_to_add <= 0) {
return s;
} else {
return s.insert(begin, String("0").repeat(zeros_to_add));
}
}
String String::trim_prefix(const String &p_prefix) const {

2
tests/core/string/test_string.h
View File

@ -1095,7 +1095,9 @@ TEST_CASE("[String] pad") {
s = String("10.10");
CHECK(s.pad_decimals(4) == U"10.1000");
CHECK(s.pad_decimals(1) == U"10.1");
CHECK(s.pad_zeros(4) == U"0010.10");
CHECK(s.pad_zeros(1) == U"10.10");
}
TEST_CASE("[String] is_subsequence_of") {