From 97f498990507ba50a68962eab9848811c2de6039 Mon Sep 17 00:00:00 2001
From: Zhiming Ma <codes.icy@gmail.com>
Date: Fri, 17 Nov 2023 15:03:16 +0800
Subject: [PATCH] fix(intellij): set manual trigger default keymap to
 Ctrl+BackSlash to avoid conflict when new UI enabled. (#811)

---
 .../intellijtabby/actions/ToggleInlineCompletionTriggerMode.kt  | 2 +-
 .../tabbyml/intellijtabby/settings/ApplicationSettingsPanel.kt  | 2 +-
 .../com/tabbyml/intellijtabby/status/StatusBarWidgetFactory.kt  | 2 +-
 clients/intellij/src/main/resources/META-INF/plugin.xml         | 1 +
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/clients/intellij/src/main/kotlin/com/tabbyml/intellijtabby/actions/ToggleInlineCompletionTriggerMode.kt b/clients/intellij/src/main/kotlin/com/tabbyml/intellijtabby/actions/ToggleInlineCompletionTriggerMode.kt
index 26aac77..0d1ad72 100644
--- a/clients/intellij/src/main/kotlin/com/tabbyml/intellijtabby/actions/ToggleInlineCompletionTriggerMode.kt
+++ b/clients/intellij/src/main/kotlin/com/tabbyml/intellijtabby/actions/ToggleInlineCompletionTriggerMode.kt
@@ -19,7 +19,7 @@ class ToggleInlineCompletionTriggerMode : AnAction() {
     val settings = service<ApplicationSettingsState>()
     if (settings.completionTriggerMode == ApplicationSettingsState.TriggerMode.AUTOMATIC) {
       e.presentation.text = "Switch to Manual Mode"
-      e.presentation.description = "Manual trigger inline completion suggestions by pressing `Alt + \\`."
+      e.presentation.description = "Manual trigger inline completion suggestions by pressing `Ctrl + \\`."
     } else {
       e.presentation.text = "Switch to Automatic Mode"
       e.presentation.description = "Show inline completion suggestions automatically."
diff --git a/clients/intellij/src/main/kotlin/com/tabbyml/intellijtabby/settings/ApplicationSettingsPanel.kt b/clients/intellij/src/main/kotlin/com/tabbyml/intellijtabby/settings/ApplicationSettingsPanel.kt
index a0ef785..fdd5b50 100644
--- a/clients/intellij/src/main/kotlin/com/tabbyml/intellijtabby/settings/ApplicationSettingsPanel.kt
+++ b/clients/intellij/src/main/kotlin/com/tabbyml/intellijtabby/settings/ApplicationSettingsPanel.kt
@@ -151,7 +151,7 @@ class ApplicationSettingsPanel {
     .addComponent(completionTriggerModeAutomaticRadioButton)
     .addCopyableTooltip("Trigger automatically when you stop typing")
     .addComponent(completionTriggerModeManualRadioButton)
-    .addCopyableTooltip("Trigger manually by pressing `Alt + \\`")
+    .addCopyableTooltip("Trigger manually by pressing `Ctrl + \\`")
     .panel
 
   private val isAnonymousUsageTrackingDisabledCheckBox = JBCheckBox("Disable anonymous usage tracking")
diff --git a/clients/intellij/src/main/kotlin/com/tabbyml/intellijtabby/status/StatusBarWidgetFactory.kt b/clients/intellij/src/main/kotlin/com/tabbyml/intellijtabby/status/StatusBarWidgetFactory.kt
index e85e9b0..af2aef7 100644
--- a/clients/intellij/src/main/kotlin/com/tabbyml/intellijtabby/status/StatusBarWidgetFactory.kt
+++ b/clients/intellij/src/main/kotlin/com/tabbyml/intellijtabby/status/StatusBarWidgetFactory.kt
@@ -131,7 +131,7 @@ class StatusBarWidgetFactory : StatusBarEditorBasedWidgetFactory() {
                 ApplicationSettingsState.TriggerMode.MANUAL -> {
                   if (state.ongoingCompletion == null) {
                     icon = AllIcons.General.ChevronRight
-                    tooltip = "Tabby: Standing by, press `Alt + \\` to trigger code completion."
+                    tooltip = "Tabby: Standing by, press `Ctrl + \\` to trigger code completion."
                   } else {
                     icon = AnimatedIcon.Default()
                     tooltip = "Tabby: Generating code completions"
diff --git a/clients/intellij/src/main/resources/META-INF/plugin.xml b/clients/intellij/src/main/resources/META-INF/plugin.xml
index 63eaa02..e62399b 100644
--- a/clients/intellij/src/main/resources/META-INF/plugin.xml
+++ b/clients/intellij/src/main/resources/META-INF/plugin.xml
@@ -58,6 +58,7 @@
                     class="com.tabbyml.intellijtabby.actions.TriggerCompletion"
                     text="Show Inline Completion"
                     description="Show inline completion suggestions at the caret's position.">
+                <keyboard-shortcut first-keystroke="ctrl BACK_SLASH" keymap="$default"/>
                 <keyboard-shortcut first-keystroke="alt BACK_SLASH" keymap="$default"/>
             </action>
             <action id="Tabby.AcceptCompletion"