Merge remote-tracking branch 'origin/master' into fcitx

src/converter/converter.cc

@@ -67,7 +67,6 @@
 namespace mozc {
 namespace {
 
-using ::mozc::prediction::PredictorInterface;
 using ::mozc::usage_stats::UsageStats;
 
 constexpr size_t kErrorIndex = static_cast<size_t>(-1);
@@ -240,8 +239,8 @@ bool Converter::StartPrediction(const ConversionRequest &request,
   if (ShouldSetKeyForPrediction(key, *segments)) {
     SetKey(segments, key);
   }
-  DCHECK_EQ(1, segments->conversion_segments_size());
-  DCHECK_EQ(key, segments->conversion_segment(0).key());
+  DCHECK_EQ(segments->conversion_segments_size(), 1);
+  DCHECK_EQ(segments->conversion_segment(0).key(), key);
 
   if (!predictor_->PredictForRequest(request, segments)) {
     // Prediction can fail for keys like "12". Even in such cases, rewriters

src/engine/BUILD.bazel

@@ -259,17 +259,6 @@ mozc_cc_library(
     ),
 )
 
-mozc_cc_test(
-    name = "engine_factory_test",
-    srcs = ["engine_factory_test.cc"],
-    deps = [
-        ":engine_factory",
-        ":engine_interface",
-        "//testing:gunit_main",
-        "@com_google_absl//absl/strings:string_view",
-    ],
-)
-
 mozc_cc_library(
     name = "eval_engine_factory",
     srcs = ["eval_engine_factory.cc"],

src/engine/engine.h

@@ -89,12 +89,6 @@ class Engine : public EngineInterface {
     return converter_ ? converter_.get() : minimal_converter_.get();
   }
 
-  absl::string_view GetPredictorName() const override {
-    static absl::string_view kDefaultPredictorName = "MinimalPredictor";
-    return converter_ ? converter_->predictor()->GetPredictorName()
-                      : kDefaultPredictorName;
-  }
-
   // Functions for Reload, Sync, Wait return true if successfully operated
   // or did nothing.
   bool Reload() override;

src/engine/engine_interface.h

@@ -56,9 +56,6 @@ class EngineInterface {
   // engine class and should not be deleted by callers.
   virtual ConverterInterface *GetConverter() const = 0;
 
-  // Returns the predictor name.
-  virtual absl::string_view GetPredictorName() const = 0;
-
   // Gets the version of underlying data set.
   virtual absl::string_view GetDataVersion() const = 0;
 

src/engine/engine_mock.h

@@ -45,7 +45,6 @@ namespace mozc {
 class MockEngine : public EngineInterface {
  public:
   MOCK_METHOD(ConverterInterface *, GetConverter, (), (const, override));
-  MOCK_METHOD(absl::string_view, GetPredictorName, (), (const, override));
   MOCK_METHOD(absl::string_view, GetDataVersion, (), (const, override));
   MOCK_METHOD(bool, Reload, (), (override));
   MOCK_METHOD(bool, Sync, (), (override));

src/session/session_converter.cc

@@ -69,8 +69,6 @@ using ::mozc::commands::Request;
 using ::mozc::config::Config;
 using ::mozc::usage_stats::UsageStats;
 
-constexpr size_t kDefaultMaxHistorySize = 3;
-
 absl::string_view GetCandidateShortcuts(
     config::Config::SelectionShortcut selection_shortcut) {
   // Keyboard shortcut for candidates.
@@ -95,15 +93,6 @@ absl::string_view GetCandidateShortcuts(
   return shortcut;
 }
 
-// Creates ConversionRequest to fill incognito candidate words.
-ConversionRequest CreateIncognitoConversionRequest(
-    const ConversionRequest &base_request, const Config &incognito_config) {
-  return ConversionRequestBuilder()
-      .SetConversionRequest(base_request)
-      .SetConfig(incognito_config)
-      .Build();
-}
-
 // Calculate cursor offset for committed text.
 int32_t CalculateCursorOffset(absl::string_view committed_text) {
   // If committed_text is a bracket pair, set the cursor in the middle.
@@ -795,8 +784,8 @@ void SessionConverter::CommitSegmentsInternal(
   candidate_list_visible_ = false;
   *consumed_key_size = 0;
 
-  // If the number of segments is one, just call Commit.
-  if (segments_.conversion_segments_size() == segments_to_commit) {
+  // If commit all segments, just call Commit.
+  if (segments_.conversion_segments_size() <= segments_to_commit) {
     Commit(composer, context);
     return;
   }
@@ -813,15 +802,11 @@ void SessionConverter::CommitSegmentsInternal(
   std::vector<size_t> candidate_ids;
   for (size_t i = 0; i < segments_to_commit; ++i) {
     // Get the i-th (0 origin) conversion segment and the selected candidate.
-    Segment *segment = segments_.mutable_conversion_segment(i);
-    if (!segment) {
-      LOG(ERROR) << "There is no segment on position " << i;
-      return;
-    }
+    const Segment &segment = segments_.conversion_segment(i);
 
     // Accumulate the size of i-th segment's key.
     // The caller will remove corresponding characters from the composer.
-    *consumed_key_size += Util::CharsLen(segment->key());
+    *consumed_key_size += Util::CharsLen(segment.key());
 
     // Collect candidate's id for each segment.
     candidate_ids.push_back(GetCandidateIndexForConverter(i));

src/session/session_handler_test.cc

@@ -803,15 +803,14 @@ TEST_F(SessionHandlerTest, ReloadFromMinimalEngine) {
   CHECK_OK(modules->Init(std::move(data_manager)));
 
   SessionHandler handler(std::move(engine));
-  EXPECT_EQ(handler.engine().GetPredictorName(), "MinimalPredictor");
+  EXPECT_NE(handler.GetDataVersion(), mock_version_);
 
   ASSERT_EQ(SendMockEngineReloadRequest(handler, mock_request_),
             EngineReloadResponse::ACCEPTED);
 
   // CreateSession updates the Engine including the Predictor.
   uint64_t id = 0;
   ASSERT_TRUE(CreateSession(handler, &id));
-  EXPECT_EQ(handler.engine().GetPredictorName(), "MobilePredictor");
   EXPECT_EQ(handler.GetDataVersion(), mock_version_);
 }