update schemas_ type

mokapsing · mokapsing · commit 1a4a9902a507 · 2024-04-03T21:08:51.000+08:00
diff --git a/src/rimeengine.h b/src/rimeengine.h
@@ -184,7 +184,7 @@ class RimeEngine final : public InputMethodEngineV2 {
 
     FCITX_ADDON_DEPENDENCY_LOADER(notifications, instance_->addonManager());
 
-    std::unordered_set<std::string> schemas_;
+    std::vector<std::string> schemas_;
     std::list<SimpleAction> schemActions_;
     std::unordered_map<std::string,
                        std::list<std::unique_ptr<RimeOptionAction>>>
diff --git a/src/rimestate.cpp b/src/rimestate.cpp
@@ -135,13 +135,11 @@ void RimeState::switchNextSchema() {
         return;
     }
     targetSchemaId = *schemas.begin();
-    if (schemas.count(currentSchemaId)) {
-        auto it = schemas.find(currentSchemaId);
+    auto it = schemas.find(currentSchemaId);
+    if (it != schemas.end()) {
+        ++it;
         if (it != schemas.end()) {
-            ++it;
-            if (it != schemas.end()) {
-                targetSchemaId = *it;
-            }
+            targetSchemaId = *it;
         }
     }
     if (targetSchemaId.empty()) {

Original file line number	Diff line number	Diff line change
`@@ -135,13 +135,11 @@ void RimeState::switchNextSchema() {`
`135`	`135`	`return;`
`136`	`136`	`}`
`137`	`137`	`targetSchemaId = *schemas.begin();`
`138`		`- if (schemas.count(currentSchemaId)) {`
`139`		`- auto it = schemas.find(currentSchemaId);`
	`138`	`+ auto it = schemas.find(currentSchemaId);`
	`139`	`+ if (it != schemas.end()) {`
	`140`	`+ ++it;`
`140`	`141`	`if (it != schemas.end()) {`
`141`		`- ++it;`
`142`		`- if (it != schemas.end()) {`
`143`		`- targetSchemaId = *it;`
`144`		`- }`
	`142`	`+ targetSchemaId = *it;`
`145`	`143`	`}`
`146`	`144`	`}`
`147`	`145`	`if (targetSchemaId.empty()) {`