root
/
tabby
mirror of https://gitee.com/zhang_1334717033/tabby.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(intellij): set manual trigger default keymap to Ctrl+BackSlash to avoid conflict when new UI enabled. (#811)

release-fix-intellij-update-support-version-range
Zhiming Ma 2023-11-17 15:03:16 +08:00 committed by GitHub
parent 549dc97e58
commit 97f4989905
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clients/intellij/src/main/kotlin/com/tabbyml/intellijtabby/actions/ToggleInlineCompletionTriggerMode.kt vendored
View File

@ -19,7 +19,7 @@ class ToggleInlineCompletionTriggerMode : AnAction() {
val settings = service<ApplicationSettingsState>() val settings = service<ApplicationSettingsState>()
if (settings.completionTriggerMode == ApplicationSettingsState.TriggerMode.AUTOMATIC) { if (settings.completionTriggerMode == ApplicationSettingsState.TriggerMode.AUTOMATIC) {
e.presentation.text = "Switch to Manual Mode" 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 { } else {
e.presentation.text = "Switch to Automatic Mode" e.presentation.text = "Switch to Automatic Mode"
e.presentation.description = "Show inline completion suggestions automatically." e.presentation.description = "Show inline completion suggestions automatically."

2
clients/intellij/src/main/kotlin/com/tabbyml/intellijtabby/settings/ApplicationSettingsPanel.kt vendored
View File

@ -151,7 +151,7 @@ class ApplicationSettingsPanel {
.addComponent(completionTriggerModeAutomaticRadioButton) .addComponent(completionTriggerModeAutomaticRadioButton)
.addCopyableTooltip("Trigger automatically when you stop typing") .addCopyableTooltip("Trigger automatically when you stop typing")
.addComponent(completionTriggerModeManualRadioButton) .addComponent(completionTriggerModeManualRadioButton)
.addCopyableTooltip("Trigger manually by pressing `Alt + \\`") .addCopyableTooltip("Trigger manually by pressing `Ctrl + \\`")
.panel .panel
private val isAnonymousUsageTrackingDisabledCheckBox = JBCheckBox("Disable anonymous usage tracking") private val isAnonymousUsageTrackingDisabledCheckBox = JBCheckBox("Disable anonymous usage tracking")

2
clients/intellij/src/main/kotlin/com/tabbyml/intellijtabby/status/StatusBarWidgetFactory.kt vendored
View File

@ -131,7 +131,7 @@ class StatusBarWidgetFactory : StatusBarEditorBasedWidgetFactory() {
ApplicationSettingsState.TriggerMode.MANUAL -> { ApplicationSettingsState.TriggerMode.MANUAL -> {
if (state.ongoingCompletion == null) { if (state.ongoingCompletion == null) {
icon = AllIcons.General.ChevronRight 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 { } else {
icon = AnimatedIcon.Default() icon = AnimatedIcon.Default()
tooltip = "Tabby: Generating code completions" tooltip = "Tabby: Generating code completions"

1
clients/intellij/src/main/resources/META-INF/plugin.xml vendored
View File

@ -58,6 +58,7 @@
class="com.tabbyml.intellijtabby.actions.TriggerCompletion" class="com.tabbyml.intellijtabby.actions.TriggerCompletion"
text="Show Inline Completion" text="Show Inline Completion"
description="Show inline completion suggestions at the caret's position."> 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"/> <keyboard-shortcut first-keystroke="alt BACK_SLASH" keymap="$default"/>
</action> </action>
<action id="Tabby.AcceptCompletion" <action id="Tabby.AcceptCompletion"