@@ -1520,9 +1520,12 @@ bool DateRewriter::Rewrite(const ConversionRequest &request,
1520
1520
return false ;
1521
1521
}
1522
1522
1523
- bool modified = false ;
1524
-
1525
1523
const Segments::range conversion_segments = segments->conversion_segments ();
1524
+ if (conversion_segments.empty ()) {
1525
+ return false ;
1526
+ }
1527
+
1528
+ bool modified = false ;
1526
1529
const std::string extra_format = GetExtraFormat (dictionary_);
1527
1530
size_t num_done = 1 ;
1528
1531
for (Segments::range rest_segments = conversion_segments;
@@ -1543,23 +1546,23 @@ bool DateRewriter::Rewrite(const ConversionRequest &request,
1543
1546
num_done = 1 ;
1544
1547
}
1545
1548
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 ;
1562
1563
}
1564
+ modified |=
1565
+ RewriteConsecutiveDigits (request.composer (), insert_pos, segments);
1563
1566
1564
1567
return modified;
1565
1568
}
0 commit comments