자동 포멧팅 기능 개선

Author: letspurify-ux

src/ui/sql_editor/intellisense/mod.rs

@@ -33,6 +33,9 @@ use super::*;
 
 const MAX_MERGED_SUGGESTIONS: usize = 100;
 const KEYUP_INTELLISENSE_DEBOUNCE_MS: u64 = 1;
+// One physical press may dispatch both KeyDown and Shortcut. A missing KeyUp
+// must not keep suppressing later presses indefinitely.
+const CTRL_ENTER_DUPLICATE_WINDOW: Duration = Duration::from_millis(100);
 const COLUMN_LOAD_WORKER_COUNT: usize = 4;
 const COLUMN_LOAD_CONTEXT_RETRY_DELAYS: [Duration; 3] = [
     Duration::from_millis(5),
@@ -82,7 +85,7 @@ enum NavigationKeyupState {
 enum EnterKeyupSuppression {
     None,
     PopupConfirm,
-    CtrlEnterExecute,
+    CtrlEnterExecute(std::time::Instant),
     #[cfg_attr(not(target_os = "macos"), allow(dead_code))]
     ImeCompositionEnter,
 }

src/ui/sql_editor/intellisense/runtime.rs

@@ -1,4 +1,34 @@
 impl SqlEditorWidget {
+    fn should_suppress_ctrl_enter_dispatch(
+        suppression: &mut EnterKeyupSuppression,
+        now: std::time::Instant,
+    ) -> bool {
+        if matches!(
+            *suppression,
+            EnterKeyupSuppression::CtrlEnterExecute(previous)
+                if now.saturating_duration_since(previous) < CTRL_ENTER_DUPLICATE_WINDOW
+        ) {
+            return true;
+        }
+
+        *suppression = EnterKeyupSuppression::CtrlEnterExecute(now);
+        false
+    }
+
+    fn take_enter_keyup_suppression(
+        key: Key,
+        suppression: &mut EnterKeyupSuppression,
+    ) -> bool {
+        if !matches!(key, Key::Enter | Key::KPEnter)
+            || matches!(*suppression, EnterKeyupSuppression::None)
+        {
+            return false;
+        }
+
+        *suppression = EnterKeyupSuppression::None;
+        true
+    }
+
     /// Apply a merge produced by [`crate::ui::sql_editor::hangul_repair`] for
     /// the macOS broken-first-Hangul-key bug.
     #[cfg(target_os = "macos")]
@@ -1062,18 +1092,18 @@ impl SqlEditorWidget {
                                 return true;
                             }
                             Key::Enter | Key::KPEnter => {
-                                if matches!(
-                                    *enter_keyup_suppression_for_handle
+                                let should_suppress = {
+                                    let mut suppression = enter_keyup_suppression_for_handle
                                         .lock()
-                                        .unwrap_or_else(|poisoned| poisoned.into_inner()),
-                                    EnterKeyupSuppression::CtrlEnterExecute
-                                ) {
+                                        .unwrap_or_else(|poisoned| poisoned.into_inner());
+                                    Self::should_suppress_ctrl_enter_dispatch(
+                                        &mut suppression,
+                                        std::time::Instant::now(),
+                                    )
+                                };
+                                if should_suppress {
                                     return true;
                                 }
-                                *enter_keyup_suppression_for_handle
-                                    .lock()
-                                    .unwrap_or_else(|poisoned| poisoned.into_inner()) =
-                                    EnterKeyupSuppression::CtrlEnterExecute;
                                 widget_for_shortcuts.execute_statement_at_cursor();
                                 return true;
                             }
@@ -1316,6 +1346,16 @@ impl SqlEditorWidget {
                         return false;
                     }
 
+                    let consume_suppressed_enter_keyup = {
+                        let mut suppression = enter_keyup_suppression_for_handle
+                            .lock()
+                            .unwrap_or_else(|poisoned| poisoned.into_inner());
+                        Self::take_enter_keyup_suppression(key, &mut suppression)
+                    };
+                    if consume_suppressed_enter_keyup {
+                        return true;
+                    }
+
                     if shortcut_modified {
                         if popup_visible {
                             intellisense_popup_for_handle
@@ -1395,49 +1435,6 @@ impl SqlEditorWidget {
                         }
                     }
 
-                    if matches!(key, Key::Enter | Key::KPEnter)
-                        && matches!(
-                            *enter_keyup_suppression_for_handle
-                                .lock()
-                                .unwrap_or_else(|poisoned| poisoned.into_inner()),
-                            EnterKeyupSuppression::ImeCompositionEnter
-                        )
-                    {
-                        *enter_keyup_suppression_for_handle
-                            .lock()
-                            .unwrap_or_else(|poisoned| poisoned.into_inner()) =
-                            EnterKeyupSuppression::None;
-                        return true;
-                    }
-                    if matches!(key, Key::Enter | Key::KPEnter)
-                        && matches!(
-                            *enter_keyup_suppression_for_handle
-                                .lock()
-                                .unwrap_or_else(|poisoned| poisoned.into_inner()),
-                            EnterKeyupSuppression::PopupConfirm
-                        )
-                    {
-                        *enter_keyup_suppression_for_handle
-                            .lock()
-                            .unwrap_or_else(|poisoned| poisoned.into_inner()) =
-                            EnterKeyupSuppression::None;
-                        return true;
-                    }
-                    if matches!(key, Key::Enter | Key::KPEnter)
-                        && matches!(
-                            *enter_keyup_suppression_for_handle
-                                .lock()
-                                .unwrap_or_else(|poisoned| poisoned.into_inner()),
-                            EnterKeyupSuppression::CtrlEnterExecute
-                        )
-                    {
-                        *enter_keyup_suppression_for_handle
-                            .lock()
-                            .unwrap_or_else(|poisoned| poisoned.into_inner()) =
-                            EnterKeyupSuppression::None;
-                        return true;
-                    }
-
                     // Navigation keys - hide popup and let editor handle cursor movement
                     if matches!(
                         key,
@@ -1758,18 +1755,18 @@ impl SqlEditorWidget {
                     }
 
                     if ctrl_or_cmd && matches!(key, Key::Enter | Key::KPEnter) {
-                        if matches!(
-                            *enter_keyup_suppression_for_handle
+                        let should_suppress = {
+                            let mut suppression = enter_keyup_suppression_for_handle
                                 .lock()
-                                .unwrap_or_else(|poisoned| poisoned.into_inner()),
-                            EnterKeyupSuppression::CtrlEnterExecute
-                        ) {
+                                .unwrap_or_else(|poisoned| poisoned.into_inner());
+                            Self::should_suppress_ctrl_enter_dispatch(
+                                &mut suppression,
+                                std::time::Instant::now(),
+                            )
+                        };
+                        if should_suppress {
                             return true;
                         }
-                        *enter_keyup_suppression_for_handle
-                            .lock()
-                            .unwrap_or_else(|poisoned| poisoned.into_inner()) =
-                            EnterKeyupSuppression::CtrlEnterExecute;
                         widget_for_shortcuts.execute_statement_at_cursor();
                         return true;
                     }

src/ui/sql_editor/intellisense/tests.rs

@@ -10007,6 +10007,36 @@ fn keyup_text_input_requires_a_real_unmodified_buffer_edit() {
     ));
 }
 
+#[test]
+fn ctrl_enter_duplicate_filter_expires_without_a_keyup() {
+    let started_at = std::time::Instant::now();
+    let mut suppression = EnterKeyupSuppression::None;
+
+    assert!(!SqlEditorWidget::should_suppress_ctrl_enter_dispatch(
+        &mut suppression,
+        started_at,
+    ));
+    assert!(SqlEditorWidget::should_suppress_ctrl_enter_dispatch(
+        &mut suppression,
+        started_at + CTRL_ENTER_DUPLICATE_WINDOW / 2,
+    ));
+    assert!(!SqlEditorWidget::should_suppress_ctrl_enter_dispatch(
+        &mut suppression,
+        started_at + CTRL_ENTER_DUPLICATE_WINDOW,
+    ));
+}
+
+#[test]
+fn ctrl_enter_keyup_clears_duplicate_filter() {
+    let mut suppression = EnterKeyupSuppression::CtrlEnterExecute(std::time::Instant::now());
+
+    assert!(SqlEditorWidget::take_enter_keyup_suppression(
+        Key::Enter,
+        &mut suppression,
+    ));
+    assert_eq!(suppression, EnterKeyupSuppression::None);
+}
+
 #[test]
 fn delete_auto_trigger_does_not_require_an_already_visible_popup() {
     assert!(SqlEditorWidget::should_auto_trigger_after_delete("a"));