Make ParsekeyVector return false when it takes multiple keys or speci…

…al keys. #codehealth PiperOrigin-RevId: 498136009
Anima-OS-Dev · Dec 28, 2022 · 4866060 · 4866060
1 parent 7ec82c9
commit 4866060
Show file tree

Hide file tree

Showing 26 changed files with 59 additions and 34 deletions.
diff --git a/src/BUILD.bazel b/src/BUILD.bazel
@@ -31,7 +31,7 @@
 #   Declaration of package_group for visibility managing.
 
 load("//:build_defs.bzl", "select_mozc")
-load("//tools/build_defs:stubs.bzl", "bzl_library")
+load("//bazel:stubs.bzl", "bzl_library")
 
 package(default_visibility = [
     "//:__subpackages__",
@@ -113,8 +113,8 @@ bzl_library(
     visibility = ["//:__subpackages__"],
     deps = [
         ":config_bzl",
+        "//bazel:stubs.bzl",
         "//devtools/build_cleaner/skylark:build_defs_lib",
-        "//tools/build_defs:stubs.bzl",
         "//tools/build_rules/android_cc_test:def",
         "@build_bazel_rules_apple//apple:apple_binary",
         "@build_bazel_rules_apple//apple:macos",

diff --git a/src/tools/build_defs/BUILD.bazel → src/bazel/tools/build_defs/BUILD.bazel b/src/tools/build_defs/BUILD.bazel → src/bazel/tools/build_defs/BUILD.bazel
@@ -27,7 +27,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-load("//tools/build_defs:stubs.bzl", "bzl_library")
+load("//bazel:stubs.bzl", "bzl_library")
 
 bzl_library(
     name = "stubs_bzl",

diff --git a/src/tools/build_defs/build_cleaner.bzl → src/bazel/tools/build_defs/build_cleaner.bzl b/src/tools/build_defs/build_cleaner.bzl → src/bazel/tools/build_defs/build_cleaner.bzl
diff --git a/src/tools/build_defs/qt.bzl → src/bazel/tools/build_defs/qt.bzl b/src/tools/build_defs/qt.bzl → src/bazel/tools/build_defs/qt.bzl
diff --git a/src/tools/build_defs/stubs.bzl → src/bazel/tools/build_defs/stubs.bzl b/src/tools/build_defs/stubs.bzl → src/bazel/tools/build_defs/stubs.bzl
diff --git a/...s/build_rules/android_cc_test/BUILD.bazel → ...s/build_rules/android_cc_test/BUILD.bazel b/...s/build_rules/android_cc_test/BUILD.bazel → ...s/build_rules/android_cc_test/BUILD.bazel
@@ -27,7 +27,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-load("//tools/build_defs:stubs.bzl", "bzl_library")
+load("//bazel:stubs.bzl", "bzl_library")
 
 bzl_library(
     name = "def_bzl",

diff --git a/...tools/build_rules/android_cc_test/def.bzl → ...tools/build_rules/android_cc_test/def.bzl b/...tools/build_rules/android_cc_test/def.bzl → ...tools/build_rules/android_cc_test/def.bzl
diff --git a/src/tools/cc_target_os/BUILD.bazel → src/bazel/tools/cc_target_os/BUILD.bazel b/src/tools/cc_target_os/BUILD.bazel → src/bazel/tools/cc_target_os/BUILD.bazel
diff --git a/src/build_defs.bzl b/src/build_defs.bzl
@@ -33,9 +33,9 @@ cc_(library|binary|test) wrappers to add :macro dependency.
 depending on it.
 """
 
-load("//tools/build_defs:build_cleaner.bzl", "register_extension_info")
-load("//tools/build_defs:stubs.bzl", "pytype_strict_binary", "pytype_strict_library")
-load("//tools/build_rules/android_cc_test:def.bzl", "android_cc_test")
+load("//bazel:stubs.bzl", "register_extension_info")
+load("//bazel:stubs.bzl", "pytype_strict_binary", "pytype_strict_library")
+load("//bazel:stubs.bzl", "android_cc_test")
 load("//:config.bzl", "BRANDING", "MACOS_BUNDLE_ID_PREFIX", "MACOS_MIN_OS_VER")
 load("@build_bazel_rules_apple//apple:apple_binary.bzl", "apple_binary")
 load("@build_bazel_rules_apple//apple:macos.bzl", "macos_application", "macos_bundle")
@@ -407,15 +407,15 @@ def select_mozc(
       Generated select statement.
     """
     return select({
-        "//tools/cc_target_os:android": _get_value([android, client, default]),
-        "//tools/cc_target_os:apple": _get_value([ios, client, default]),
-        "//tools/cc_target_os:chromiumos": _get_value([chromiumos, client, default]),
-        "//tools/cc_target_os:darwin": _get_value([macos, ios, client, default]),
-        "//tools/cc_target_os:wasm": _get_value([wasm, client, default]),
-        "//tools/cc_target_os:windows": _get_value([windows, client, default]),
-        "//tools/cc_target_os:linux": _get_value([linux, client, default]),
-        "//tools/cc_target_os:oss_android": _get_value([oss_android, oss, android, client, default]),
-        "//tools/cc_target_os:oss_linux": _get_value([oss_linux, oss, linux, client, default]),
-        "//tools/cc_target_os:oss_macos": _get_value([oss_macos, oss, macos, ios, client, default]),
+        "//bazel/cc_target_os:android": _get_value([android, client, default]),
+        "//bazel/cc_target_os:apple": _get_value([ios, client, default]),
+        "//bazel/cc_target_os:chromiumos": _get_value([chromiumos, client, default]),
+        "//bazel/cc_target_os:darwin": _get_value([macos, ios, client, default]),
+        "//bazel/cc_target_os:wasm": _get_value([wasm, client, default]),
+        "//bazel/cc_target_os:windows": _get_value([windows, client, default]),
+        "//bazel/bazel/cc_target_os:linux": _get_value([linux, client, default]),
+        "//bazel/bazel/cc_target_os:oss_android": _get_value([oss_android, oss, android, client, default]),
+        "//bazel/bazel/cc_target_os:oss_linux": _get_value([oss_linux, oss, linux, client, default]),
+        "//bazel/bazel/cc_target_os:oss_macos": _get_value([oss_macos, oss, macos, ios, client, default]),
         "//conditions:default": default,
     })
diff --git a/src/composer/key_parser.cc b/src/composer/key_parser.cc
@@ -200,6 +200,10 @@ bool KeyParser::ParseKeyVector(const std::vector<std::string> &keys,
 
   for (const std::string &key : keys) {
     if (Util::CharsLen(key) == 1) {
+      if (key_event->has_key_code()) {
+        // Multiple keys are not supported.
+        return false;
+      }
       key_event->set_key_code(Util::Utf8ToUcs4(key));
       continue;
     }
@@ -212,6 +216,10 @@ bool KeyParser::ParseKeyVector(const std::vector<std::string> &keys,
       continue;
     }
     if (const auto &it = specials.find(lower_key); it != specials.end()) {
+      if (key_event->has_special_key()) {
+        // Multiple special keys are not supported.
+        return false;
+      }
       key_event->set_special_key(it->second);
       continue;
     }

diff --git a/src/composer/key_parser_test.cc b/src/composer/key_parser_test.cc
@@ -196,13 +196,30 @@ TEST(KeyParserTest, Combination) {
 
   EXPECT_TRUE(KeyParser::ParseKey("rightalt On", &key_event));
   EXPECT_EQ(key_event.special_key(), KeyEvent::ON);
-  EXPECT_EQ(KeyEvent::RIGHT_ALT | KeyEvent::ALT,
-            KeyEventUtil::GetModifiers(key_event));
+  EXPECT_EQ(KeyEventUtil::GetModifiers(key_event),
+            KeyEvent::RIGHT_ALT | KeyEvent::ALT);
 
   EXPECT_TRUE(KeyParser::ParseKey("SHIFT on a", &key_event));
   EXPECT_EQ(key_event.key_code(), 'a');
   EXPECT_EQ(key_event.special_key(), KeyEvent::ON);
   EXPECT_EQ(KeyEventUtil::GetModifiers(key_event), KeyEvent::SHIFT);
+
+  EXPECT_TRUE(KeyParser::ParseKey("alt a", &key_event));
+  EXPECT_EQ(key_event.key_code(), 'a');
+  EXPECT_FALSE(key_event.has_special_key());
+  EXPECT_EQ(KeyEventUtil::GetModifiers(key_event), KeyEvent::ALT);
+
+  // meta and hyper are identical to alt.
+  EXPECT_TRUE(KeyParser::ParseKey("a meta hyper", &key_event));
+  EXPECT_EQ(key_event.key_code(), 'a');
+  EXPECT_FALSE(key_event.has_special_key());
+  EXPECT_EQ(KeyEventUtil::GetModifiers(key_event), KeyEvent::ALT);
+
+  // multiple keys are not supported.
+  EXPECT_FALSE(KeyParser::ParseKey("a alt z", &key_event));
+
+  // multiple special keys are not supported.
+  EXPECT_FALSE(KeyParser::ParseKey("muhenkan backspace", &key_event));
 }
 
 }  // namespace mozc
diff --git a/src/converter/BUILD.bazel b/src/converter/BUILD.bazel
@@ -27,7 +27,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-load("//tools/build_defs:stubs.bzl", "bzl_library")
+load("//bazel:stubs.bzl", "bzl_library")
 load(
     "//:build_defs.bzl",
     "cc_binary_mozc",

diff --git a/src/data/version/BUILD.bazel b/src/data/version/BUILD.bazel
@@ -30,7 +30,7 @@
 # Description: Version configuration for Google Japanese Input
 
 load("//data/version:mozc_version_template.bzl", "BUILD", "MAJOR", "MINOR", "REVISION_MACOS")
-load("//tools/build_defs:stubs.bzl", "bzl_library")
+load("//bazel:stubs.bzl", "bzl_library")
 load("@build_bazel_rules_apple//apple:versioning.bzl", "apple_bundle_version")
 
 exports_files(

diff --git a/src/data_manager/BUILD.bazel b/src/data_manager/BUILD.bazel
@@ -27,7 +27,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-load("//tools/build_defs:stubs.bzl", "bzl_library")
+load("//bazel:stubs.bzl", "bzl_library")
 load(
     "//:build_defs.bzl",
     "cc_binary_mozc",

diff --git a/src/gui/about_dialog/BUILD.bazel b/src/gui/about_dialog/BUILD.bazel
@@ -28,7 +28,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 load(
-    "//tools/build_defs:qt.bzl",
+    "//bazel/tools/build_defs:qt.bzl",
     "cc_qt_binary_mozc",
     "cc_qt_library_mozc",
     "macos_qt_application_mozc",

diff --git a/src/gui/administration_dialog/BUILD.bazel b/src/gui/administration_dialog/BUILD.bazel
@@ -28,7 +28,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 load(
-    "//tools/build_defs:qt.bzl",
+    "//bazel/tools/build_defs:qt.bzl",
     "cc_qt_binary_mozc",
     "cc_qt_library_mozc",
     "qt_moc_mozc",

diff --git a/src/gui/base/BUILD.bazel b/src/gui/base/BUILD.bazel
@@ -32,7 +32,7 @@ load(
     "cc_library_mozc",
 )
 load(
-    "//tools/build_defs:qt.bzl",
+    "//bazel/tools/build_defs:qt.bzl",
     "cc_qt_library_mozc",
     "qt_moc_mozc",
     "qt_rcc_mozc",

diff --git a/src/gui/config_dialog/BUILD.bazel b/src/gui/config_dialog/BUILD.bazel
@@ -28,7 +28,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 load(
-    "//tools/build_defs:qt.bzl",
+    "//bazel/tools/build_defs:qt.bzl",
     "cc_qt_binary_mozc",
     "cc_qt_library_mozc",
     "macos_qt_application_mozc",

diff --git a/src/gui/dictionary_tool/BUILD.bazel b/src/gui/dictionary_tool/BUILD.bazel
@@ -28,7 +28,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 load(
-    "//tools/build_defs:qt.bzl",
+    "//bazel/tools/build_defs:qt.bzl",
     "cc_qt_binary_mozc",
     "cc_qt_library_mozc",
     "macos_qt_application_mozc",

diff --git a/src/gui/error_message_dialog/BUILD.bazel b/src/gui/error_message_dialog/BUILD.bazel
@@ -28,7 +28,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 load(
-    "//tools/build_defs:qt.bzl",
+    "//bazel/tools/build_defs:qt.bzl",
     "cc_qt_binary_mozc",
     "cc_qt_library_mozc",
     "macos_qt_application_mozc",

diff --git a/src/gui/post_install_dialog/BUILD.bazel b/src/gui/post_install_dialog/BUILD.bazel
@@ -28,7 +28,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 load(
-    "//tools/build_defs:qt.bzl",
+    "//bazel/tools/build_defs:qt.bzl",
     "cc_qt_binary_mozc",
     "cc_qt_library_mozc",
     "macos_qt_application_mozc",

diff --git a/src/gui/set_default_dialog/BUILD.bazel b/src/gui/set_default_dialog/BUILD.bazel
@@ -28,7 +28,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 load(
-    "//tools/build_defs:qt.bzl",
+    "//bazel/tools/build_defs:qt.bzl",
     "cc_qt_binary_mozc",
     "cc_qt_library_mozc",
     "macos_qt_application_mozc",

diff --git a/src/gui/tool/BUILD.bazel b/src/gui/tool/BUILD.bazel
@@ -30,7 +30,7 @@
 load("//:build_defs.bzl", "cc_library_mozc", "select_mozc")
 load("//:config.bzl", "BRANDING")
 load(
-    "//tools/build_defs:qt.bzl",
+    "//bazel/tools/build_defs:qt.bzl",
     "cc_qt_binary_mozc",
     "cc_qt_library_mozc",
     "macos_qt_application_mozc",

diff --git a/src/gui/word_register_dialog/BUILD.bazel b/src/gui/word_register_dialog/BUILD.bazel
@@ -28,7 +28,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 load(
-    "//tools/build_defs:qt.bzl",
+    "//bazel/tools/build_defs:qt.bzl",
     "cc_qt_binary_mozc",
     "cc_qt_library_mozc",
     "macos_qt_application_mozc",

diff --git a/src/protocol/BUILD.bazel b/src/protocol/BUILD.bazel
@@ -27,7 +27,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-load("//tools/build_defs:stubs.bzl", "jspb_proto_library")
+load("//bazel:stubs.bzl", "jspb_proto_library")
 
 package(default_visibility = [
     "//:__subpackages__",

diff --git a/src/renderer/qt/BUILD.bazel b/src/renderer/qt/BUILD.bazel
@@ -32,7 +32,7 @@ load(
     "cc_library_mozc",
 )
 load(
-    "//tools/build_defs:qt.bzl",
+    "//bazel/tools/build_defs:qt.bzl",
     "cc_qt_library_mozc",
     "qt_moc_mozc",
 )