Skip to content

Commit a0352ea

Browse files
Simplify unnecessary conditional execution in DateRewriter::Rewrite.
#codehealth PiperOrigin-RevId: 719152065
1 parent 662b9b5 commit a0352ea

File tree

1 file changed

+21
-18
lines changed

1 file changed

+21
-18
lines changed

Diff for: src/rewriter/date_rewriter.cc

+21-18
Original file line numberDiff line numberDiff line change
@@ -1520,9 +1520,12 @@ bool DateRewriter::Rewrite(const ConversionRequest &request,
15201520
return false;
15211521
}
15221522

1523-
bool modified = false;
1524-
15251523
const Segments::range conversion_segments = segments->conversion_segments();
1524+
if (conversion_segments.empty()) {
1525+
return false;
1526+
}
1527+
1528+
bool modified = false;
15261529
const std::string extra_format = GetExtraFormat(dictionary_);
15271530
size_t num_done = 1;
15281531
for (Segments::range rest_segments = conversion_segments;
@@ -1543,23 +1546,23 @@ bool DateRewriter::Rewrite(const ConversionRequest &request,
15431546
num_done = 1;
15441547
}
15451548

1546-
if (!conversion_segments.empty()) {
1547-
// Select the insert position by Romaji table. Note:
1548-
// TOGGLE_FLICK_TO_HIRAGANA uses digits for Hiragana composing, date/time
1549-
// conversion is performed even when typing Hiragana characters. Thus, it
1550-
// should not be promoted.
1551-
int insert_pos =
1552-
static_cast<int>(conversion_segments.front().candidates_size());
1553-
switch (request.request().special_romanji_table()) {
1554-
case commands::Request::QWERTY_MOBILE_TO_HALFWIDTHASCII:
1555-
insert_pos = 1;
1556-
break;
1557-
default:
1558-
break;
1559-
}
1560-
modified |=
1561-
RewriteConsecutiveDigits(request.composer(), insert_pos, segments);
1549+
// Select the insert position by Romaji table. Note:
1550+
// TOGGLE_FLICK_TO_HIRAGANA uses digits for Hiragana composing, date/time
1551+
// conversion is performed even when typing Hiragana characters. Thus, it
1552+
// should not be promoted.
1553+
int insert_pos =
1554+
static_cast<int>(conversion_segments.front().candidates_size());
1555+
switch (request.request().special_romanji_table()) {
1556+
case commands::Request::QWERTY_MOBILE_TO_HALFWIDTHASCII:
1557+
case commands::Request::FLICK_TO_NUMBER:
1558+
case commands::Request::TOGGLE_FLICK_TO_NUMBER:
1559+
insert_pos = 1;
1560+
break;
1561+
default:
1562+
break;
15621563
}
1564+
modified |=
1565+
RewriteConsecutiveDigits(request.composer(), insert_pos, segments);
15631566

15641567
return modified;
15651568
}

0 commit comments

Comments
 (0)