fix: 修复部分非预期场景下仍然在英文和中文间插入了空格的问题，关联issue #129 ,修复1，3

qwertyyb · Apr 16, 2024 · 7ba5189 · 7ba5189
1 parent 6a8a477
commit 7ba5189
Showing 1 changed file with 13 additions and 0 deletions.
diff --git a/Fire/FireInputController.swift b/Fire/FireInputController.swift
@@ -141,12 +141,25 @@ class FireInputController: IMKInputController {
     }
 
     private func predictorHandler(event: NSEvent) -> Bool? {
+        // 在数字后输入。号自动转换为小数点
         if Defaults[.enableDotAfterNumber] && event.keyCode == kVK_ANSI_Period && _lastInputIsNumber {
             insertText(".")
             _lastInputIsNumber = false
             return true
         }
         _lastInputIsNumber = false
+
+        // 若预期操作不在白名单范围内，则把lastInputText置空
+        let match = try? NSRegularExpression(pattern: "^[a-zA-Z0-9]+$")
+            .firstMatch(
+                in: event.characters ?? "",
+                range: NSMakeRange(0, (event.characters ?? "").count)
+            )
+        if match == nil
+            && event.keyCode != kVK_Space
+            && (event.keyCode != kVK_Return || (event.keyCode == kVK_Return && _originalString.count <= 0)) {
+            _lastInputText = ""
+        }
         return nil
     }