Skip to content

replace stringutils::startsWith and endsWith #116

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wengxt merged 1 commit into from
Dec 23, 2025
Merged

replace stringutils::startsWith and endsWith #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/libime/pinyin/pinyinprediction.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ PinyinPrediction::predict(const State &state,
[this, &sentence, &prevState, &cmp, &intermedidateResult, &dup,
maxSize](std::string_view, std::string_view hz, float cost) {
if (sentence.back().size() < hz.size() &&
fcitx::stringutils::startsWith(hz, sentence.back())) {
hz.starts_with(sentence.back())) {

std::string newWord(hz.substr(sentence.back().size()));
if (dup.contains(newWord)) {
Expand Down
10 changes: 4 additions & 6 deletions src/libime/table/tablebaseddictionary.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,7 @@ inline std::string generateTableEntry(uint32_t pinyinKey, std::string_view key,
}

void maybeUnescapeValue(std::string &value) {
if (value.size() >= 2 && fcitx::stringutils::startsWith(value, '"') &&
fcitx::stringutils::endsWith(value, '"')) {
if (value.size() >= 2 && value.starts_with('"') && value.ends_with('"')) {
if (auto unescape = fcitx::stringutils::unescapeForValue(value)) {
value = unescape.value();
}
Expand All @@ -112,8 +111,7 @@ void maybeUnescapeValue(std::string &value) {
std::string maybeEscapeValue(std::string_view value) {
auto escaped = fcitx::stringutils::escapeForValue(value);
if (escaped.size() != value.size()) {
if (fcitx::stringutils::startsWith(escaped, "\"") &&
fcitx::stringutils::endsWith(escaped, "\"")) {
if (escaped.starts_with("\"") && escaped.ends_with("\"")) {
return escaped;
}
return fcitx::stringutils::concat("\"", escaped, "\"");
Expand Down Expand Up @@ -673,7 +671,7 @@ void TableBasedDictionary::loadText(std::istream &in) {

switch (phase) {
case BuildPhase::PhaseConfig: {
if (fcitx::stringutils::startsWith(line, "#")) {
if (line.starts_with("#")) {
continue;
}

Expand Down Expand Up @@ -716,7 +714,7 @@ void TableBasedDictionary::loadText(std::istream &in) {
break;
}
case BuildPhase::PhaseRule: {
if (fcitx::stringutils::startsWith(line, "#")) {
if (line.starts_with("#")) {
continue;
}
if (consumeOptionPrefix(line, STR_DATA)) {
Expand Down
2 changes: 1 addition & 1 deletion tools/libime_migrate_fcitx4_table.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ std::optional<std::string> replaceSuffix(const std::string &input,
const std::string &suffix,
std::string_view newSuffix) {
auto name = fs::baseName(input);
if (!stringutils::endsWith(name, suffix)) {
if (!name.ends_with(suffix)) {
return {};
}
// Strip .mb
Expand Down
Loading