fix: better external link logics

CyanSalt · CyanSalt · commit 10857b11f8d2 · 2024-10-17T14:55:53.000+08:00
diff --git a/addons/settings/locales/zh-CN.json b/addons/settings/locales/zh-CN.json
@@ -38,7 +38,6 @@
   "Skip by default#!settings.comments.2.terminal.external.remoteExplorer": "默认跳过",
   "Extra External Link Modifier#!settings.label.terminal.external.extraLinkModifier": "外部链接额外修饰键",
   "Extra keyboard modifier for opening external link by click#!settings.comments.0.terminal.external.extraLinkModifier": "点击打开外部链接时的额外键盘修饰键",
-  "A value like 'no-Shift' means that links will be open externally by default unless Shift is pressed#!settings.comments.1.terminal.external.extraLinkModifier": "'no-Shift' 等值意味着链接默认在外部打开，除非按下 Shift 键",
   "Tab#!settings.group.terminal.tab": "标签页",
   "Enable Live CWD#!settings.label.terminal.tab.liveCwd": "启用实时工作路径",
   "Support dynamic \\w and \\W in formatting#!settings.comments.0.terminal.tab.liveCwd": "在格式中支持动态的 \\w 和 \\W",
diff --git a/resources/settings.spec.json b/resources/settings.spec.json
@@ -182,14 +182,13 @@
     "key": "terminal.external.extraLinkModifier",
     "label": "Extra External Link Modifier",
     "comments": [
-      "Extra keyboard modifier for opening external link by click",
-      "A value like 'no-Shift' means that links will be open externally by default unless Shift is pressed"
+      "Extra keyboard modifier for opening external link by click"
     ],
     "schema": {
       "type": "string",
-      "enum": ["no-Shift", "Shift", "no-Alt", "Alt"]
+      "enum": ["any", "CmdOrCtrl", "Alt", "Shift"]
     },
-    "default": "no-Shift"
+    "default": "any"
   },
   {
     "key": "terminal.tab.liveCwd",
diff --git a/src/renderer/compositions/terminal.ts b/src/renderer/compositions/terminal.ts
@@ -171,16 +171,14 @@ function isMatchLinkModifier(event: MouseEvent | KeyboardEvent) {
 
 function isMatchExternalLinkModifier(event: MouseEvent | KeyboardEvent) {
   switch (settings['terminal.external.extraLinkModifier']) {
-    case 'no-Shift':
-      return !event.shiftKey
     case 'Shift':
       return event.shiftKey
     case 'Alt':
       return event.altKey
-    case 'no-Alt':
-      return !event.altKey
+    case 'CmdOrCtrl':
+      return process.platform === 'darwin' ? event.metaKey : event.ctrlKey
     default:
-      return false
+      return event.shiftKey || event.altKey || (process.platform === 'darwin' ? event.metaKey : event.ctrlKey)
   }
 }
 
diff --git a/src/types/settings.ts b/src/types/settings.ts
@@ -20,7 +20,7 @@ export interface Settings {
   'terminal.external.openPathIn': 'new-tab' | 'new-window',
   'terminal.external.explorer': string,
   'terminal.external.remoteExplorer': string,
-  'terminal.external.extraLinkModifier': 'no-Shift' | 'Shift' | 'no-Alt' | 'Alt',
+  'terminal.external.extraLinkModifier': 'any' | 'CmdOrCtrl' | 'Alt' | 'Shift',
   'terminal.tab.liveCwd': boolean,
   'terminal.tab.liveIcon': boolean,
   'terminal.tab.livePreview': boolean,
