From 59d2c170366acced8757f94ef7debc0939fb2f2b Mon Sep 17 00:00:00 2001
From: purocean <purocean@gmail.com>
Date: Fri, 29 Oct 2021 11:38:54 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E9=87=8D=E5=91=BD=E5=90=8D=20comma?=
 =?UTF-8?q?nd?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/components/FileTabs.vue            | 2 +-
 src/renderer/components/Filter.vue              | 2 +-
 src/renderer/context/index.ts                   | 4 ++--
 src/renderer/core/action.ts                     | 2 +-
 src/renderer/core/{shortcut.ts => command.ts}   | 2 +-
 src/renderer/plugins/copy-text.ts               | 2 +-
 src/renderer/plugins/document-history-stack.ts  | 8 ++++----
 src/renderer/plugins/markdown-code-copy.ts      | 2 +-
 src/renderer/plugins/markdown-code-run.ts       | 2 +-
 src/renderer/plugins/markdown-toc.ts            | 2 +-
 src/renderer/plugins/status-bar-help.ts         | 2 +-
 src/renderer/plugins/status-bar-navigation.ts   | 2 +-
 src/renderer/plugins/status-bar-presentation.ts | 2 +-
 src/renderer/plugins/status-bar-terminal.ts     | 2 +-
 src/renderer/plugins/status-bar-view.ts         | 2 +-
 src/renderer/plugins/table-cell-edit.ts         | 2 +-
 src/renderer/plugins/transform-img-out-link.ts  | 4 ++--
 src/renderer/services/editor.ts                 | 2 +-
 src/renderer/services/layout.ts                 | 2 +-
 src/renderer/services/view.ts                   | 2 +-
 src/renderer/startup.ts                         | 2 +-
 21 files changed, 26 insertions(+), 26 deletions(-)
 rename src/renderer/core/{shortcut.ts => command.ts} (99%)

diff --git a/src/renderer/components/FileTabs.vue b/src/renderer/components/FileTabs.vue
index db489ce4..53c48cb0 100644
--- a/src/renderer/components/FileTabs.vue
+++ b/src/renderer/components/FileTabs.vue
@@ -5,7 +5,7 @@
 <script lang="ts">
 import { useStore } from 'vuex'
 import { computed, defineComponent, onBeforeMount, onBeforeUnmount, ref, toRefs, watch } from 'vue'
-import { Alt, Ctrl } from '@fe/core/shortcut'
+import { Alt, Ctrl } from '@fe/core/command'
 import type { Components, Doc } from '@fe/types'
 import { useBus } from '@fe/core/bus'
 import { registerAction, removeAction } from '@fe/core/action'
diff --git a/src/renderer/components/Filter.vue b/src/renderer/components/Filter.vue
index 5b4bf9a1..40746a05 100644
--- a/src/renderer/components/Filter.vue
+++ b/src/renderer/components/Filter.vue
@@ -10,7 +10,7 @@ import { switchDoc } from '@fe/services/document'
 import XMask from './Mask.vue'
 import { registerAction, removeAction } from '@fe/core/action'
 import QuickOpen from './QuickOpen.vue'
-import { CtrlCmd } from '@fe/core/shortcut'
+import { CtrlCmd } from '@fe/core/command'
 
 export default defineComponent({
   name: 'x-filter',
diff --git a/src/renderer/context/index.ts b/src/renderer/context/index.ts
index 04b821e3..6938d226 100644
--- a/src/renderer/context/index.ts
+++ b/src/renderer/context/index.ts
@@ -2,7 +2,7 @@ import * as storage from '@fe/utils/storage'
 import * as utils from '@fe/utils/index'
 import * as plugin from '@fe/core/plugin'
 import * as action from '@fe/core/action'
-import * as shortcut from '@fe/core/shortcut'
+import * as command from '@fe/core/command'
 import { useBus } from '@fe/core/bus'
 import { useToast } from '@fe/support/ui/toast'
 import { useModal } from '@fe/support/ui/modal'
@@ -30,7 +30,7 @@ const ctx = {
   store,
   action,
   doc,
-  shortcut,
+  command,
   tree,
   markdown,
   statusBar,
diff --git a/src/renderer/core/action.ts b/src/renderer/core/action.ts
index 925ade0f..ce67fbe2 100644
--- a/src/renderer/core/action.ts
+++ b/src/renderer/core/action.ts
@@ -1,7 +1,7 @@
 import { getLogger } from '@fe/utils'
 import { useBus } from '@fe/core/bus'
 import { BuildInActionName } from '@fe/types'
-import { registerCommand, removeCommand } from './shortcut'
+import { registerCommand, removeCommand } from './command'
 
 const logger = getLogger('action')
 const bus = useBus()
diff --git a/src/renderer/core/shortcut.ts b/src/renderer/core/command.ts
similarity index 99%
rename from src/renderer/core/shortcut.ts
rename to src/renderer/core/command.ts
index de0c1e59..754293f4 100644
--- a/src/renderer/core/shortcut.ts
+++ b/src/renderer/core/command.ts
@@ -3,7 +3,7 @@ import { getLogger } from '@fe/utils'
 import { isMacOS } from '@fe/support/env'
 import { getActionHandler } from './action'
 
-const logger = getLogger('shortcut')
+const logger = getLogger('command')
 
 export const Escape = 'Escape'
 export const Ctrl = 'Ctrl'
diff --git a/src/renderer/plugins/copy-text.ts b/src/renderer/plugins/copy-text.ts
index c0830c38..2928bb0d 100644
--- a/src/renderer/plugins/copy-text.ts
+++ b/src/renderer/plugins/copy-text.ts
@@ -1,5 +1,5 @@
 import { Plugin } from '@fe/context'
-import { hasCtrlCmd } from '@fe/core/shortcut'
+import { hasCtrlCmd } from '@fe/core/command'
 import { copyText, encodeMarkdownLink } from '@fe/utils'
 import store from '@fe/support/store'
 
diff --git a/src/renderer/plugins/document-history-stack.ts b/src/renderer/plugins/document-history-stack.ts
index 6a52a392..5c8a2d84 100644
--- a/src/renderer/plugins/document-history-stack.ts
+++ b/src/renderer/plugins/document-history-stack.ts
@@ -35,7 +35,7 @@ export default {
               type: 'normal' as any,
               title: '前进',
               disabled: idx >= stack.length - 1,
-              subTitle: ctx.shortcut.getKeysLabel(forwardId),
+              subTitle: ctx.command.getKeysLabel(forwardId),
               onClick: () => ctx.action.getActionHandler(forwardId)()
             },
             {
@@ -43,7 +43,7 @@ export default {
               type: 'normal' as any,
               title: '后退',
               disabled: idx <= 0,
-              subTitle: ctx.shortcut.getKeysLabel(backId),
+              subTitle: ctx.command.getKeysLabel(backId),
               onClick: () => ctx.action.getActionHandler(backId)()
             },
           ].concat(list.filter(x => ![forwardId, backId].includes(x.id as BuildInActionName)) as any)
@@ -74,13 +74,13 @@ export default {
     ctx.action.registerAction({
       name: backId,
       handler: () => go(-1),
-      keys: [ctx.shortcut.Alt, ctx.shortcut.BracketLeft],
+      keys: [ctx.command.Alt, ctx.command.BracketLeft],
     })
 
     ctx.action.registerAction({
       name: forwardId,
       handler: () => go(1),
-      keys: [ctx.shortcut.Alt, ctx.shortcut.BracketRight],
+      keys: [ctx.command.Alt, ctx.command.BracketRight],
     })
   }
 } as Plugin
diff --git a/src/renderer/plugins/markdown-code-copy.ts b/src/renderer/plugins/markdown-code-copy.ts
index 5863284a..c59d589a 100644
--- a/src/renderer/plugins/markdown-code-copy.ts
+++ b/src/renderer/plugins/markdown-code-copy.ts
@@ -34,7 +34,7 @@ export default {
       const codeInline = (fn: Function) => (tokens: any, idx: any, options: any, env: any, slf: any) => {
         if (tokens[idx].attrIndex('title') < 0) {
           tokens[idx].attrJoin('class', 'copy-inner-text')
-          tokens[idx].attrPush(['title', ctx.shortcut.getKeyLabel('CtrlCmd') + ' + 单击复制'])
+          tokens[idx].attrPush(['title', ctx.command.getKeyLabel('CtrlCmd') + ' + 单击复制'])
         }
 
         return (fn)(tokens, idx, options, env, slf)
diff --git a/src/renderer/plugins/markdown-code-run.ts b/src/renderer/plugins/markdown-code-run.ts
index 57953e94..d5f43183 100644
--- a/src/renderer/plugins/markdown-code-run.ts
+++ b/src/renderer/plugins/markdown-code-run.ts
@@ -5,7 +5,7 @@ import { getActionHandler } from '@fe/core/action'
 import * as api from '@fe/support/api'
 import { FLAG_DISABLE_XTERM } from '@fe/support/args'
 import SvgIcon from '@fe/components/SvgIcon.vue'
-import { CtrlCmd, getKeyLabel, matchKeys } from '@fe/core/shortcut'
+import { CtrlCmd, getKeyLabel, matchKeys } from '@fe/core/command'
 import { md5 } from '@fe/utils'
 
 const cache: Record<string, string> = {}
diff --git a/src/renderer/plugins/markdown-toc.ts b/src/renderer/plugins/markdown-toc.ts
index 39194d60..5500e47c 100644
--- a/src/renderer/plugins/markdown-toc.ts
+++ b/src/renderer/plugins/markdown-toc.ts
@@ -2,7 +2,7 @@
 
 import Markdown from 'markdown-it'
 import StateInline from 'markdown-it/lib/rules_inline/state_inline'
-import { getKeyLabel } from '@fe/core/shortcut'
+import { getKeyLabel } from '@fe/core/command'
 import { Plugin } from '@fe/context'
 
 import { injectLineNumbers } from './markdown-source-line'
diff --git a/src/renderer/plugins/status-bar-help.ts b/src/renderer/plugins/status-bar-help.ts
index 206a44e5..c8ecc833 100644
--- a/src/renderer/plugins/status-bar-help.ts
+++ b/src/renderer/plugins/status-bar-help.ts
@@ -1,6 +1,6 @@
 import { showHelp } from '@fe/services/document'
 import { Plugin } from '@fe/context'
-import { Alt, getKeysLabel } from '@fe/core/shortcut'
+import { Alt, getKeysLabel } from '@fe/core/command'
 
 export default {
   name: 'status-bar-help',
diff --git a/src/renderer/plugins/status-bar-navigation.ts b/src/renderer/plugins/status-bar-navigation.ts
index 5b6bf57d..1c29d94d 100644
--- a/src/renderer/plugins/status-bar-navigation.ts
+++ b/src/renderer/plugins/status-bar-navigation.ts
@@ -1,6 +1,6 @@
 import { Plugin } from '@fe/context'
 import { getActionHandler } from '@fe/core/action'
-import { getKeysLabel } from '@fe/core/shortcut'
+import { getKeysLabel } from '@fe/core/command'
 
 export default {
   name: 'status-bar-navigation',
diff --git a/src/renderer/plugins/status-bar-presentation.ts b/src/renderer/plugins/status-bar-presentation.ts
index 0bbb7464..f26640ff 100644
--- a/src/renderer/plugins/status-bar-presentation.ts
+++ b/src/renderer/plugins/status-bar-presentation.ts
@@ -9,7 +9,7 @@ export default {
       menus['status-bar-presentation'] = {
         id: 'status-bar-presentation',
         position: 'right',
-        tips: `预览 (${ctx.shortcut.getKeysLabel(action!.name)})`,
+        tips: `预览 (${ctx.command.getKeysLabel(action!.name)})`,
         icon: 'presentation',
         onClick: () => ctx.view.enterPresent()
       }
diff --git a/src/renderer/plugins/status-bar-terminal.ts b/src/renderer/plugins/status-bar-terminal.ts
index 8653c971..6d932b8d 100644
--- a/src/renderer/plugins/status-bar-terminal.ts
+++ b/src/renderer/plugins/status-bar-terminal.ts
@@ -12,7 +12,7 @@ export default {
       menus['status-bar-terminal'] = {
         id: 'status-bar-terminal',
         position: 'right',
-        tips: `切换终端 (${ctx.shortcut.getKeysLabel('layout.toggle-xterm')})`,
+        tips: `切换终端 (${ctx.command.getKeysLabel('layout.toggle-xterm')})`,
         icon: 'terminal',
         onClick: () => ctx.action.getActionHandler('layout.toggle-xterm')()
       }
diff --git a/src/renderer/plugins/status-bar-view.ts b/src/renderer/plugins/status-bar-view.ts
index aff2fe98..a0b91386 100644
--- a/src/renderer/plugins/status-bar-view.ts
+++ b/src/renderer/plugins/status-bar-view.ts
@@ -1,7 +1,7 @@
 import { Plugin } from '@fe/context'
 import { FLAG_DISABLE_XTERM } from '@fe/support/args'
 import { getActionHandler } from '@fe/core/action'
-import { getKeysLabel } from '@fe/core/shortcut'
+import { getKeysLabel } from '@fe/core/command'
 
 export default {
   name: 'status-bar-view',
diff --git a/src/renderer/plugins/table-cell-edit.ts b/src/renderer/plugins/table-cell-edit.ts
index 50d14522..868f2204 100644
--- a/src/renderer/plugins/table-cell-edit.ts
+++ b/src/renderer/plugins/table-cell-edit.ts
@@ -1,6 +1,6 @@
 import { useModal } from '@fe/support/ui/modal'
 import { Plugin } from '@fe/context'
-import { hasCtrlCmd } from '@fe/core/shortcut'
+import { hasCtrlCmd } from '@fe/core/command'
 import { getActionHandler } from '@fe/core/action'
 import { useToast } from '@fe/support/ui/toast'
 import { getLineContent, replaceLine } from '@fe/services/editor'
diff --git a/src/renderer/plugins/transform-img-out-link.ts b/src/renderer/plugins/transform-img-out-link.ts
index f4252707..f89f89b6 100644
--- a/src/renderer/plugins/transform-img-out-link.ts
+++ b/src/renderer/plugins/transform-img-out-link.ts
@@ -3,7 +3,7 @@ import * as api from '@fe/support/api'
 import { encodeMarkdownLink } from '@fe/utils'
 import { useToast } from '@fe/support/ui/toast'
 import store from '@fe/support/store'
-import { CtrlCmd, getKeysLabel, isCommand, LeftClick, Shift } from '@fe/core/shortcut'
+import { CtrlCmd, getKeysLabel, isCommand, LeftClick, Shift } from '@fe/core/command'
 import { replaceValue } from '@fe/services/editor'
 import { refreshTree } from '@fe/services/tree'
 import { upload } from '@fe/services/base'
@@ -112,7 +112,7 @@ export default {
       handler: transformAll
     })
 
-    ctx.shortcut.registerCommand({
+    ctx.command.registerCommand({
       id: actionClick,
       keys: [CtrlCmd, Shift, LeftClick],
       handler: null
diff --git a/src/renderer/services/editor.ts b/src/renderer/services/editor.ts
index ff593583..4d22da8d 100644
--- a/src/renderer/services/editor.ts
+++ b/src/renderer/services/editor.ts
@@ -4,7 +4,7 @@ import { isElectron } from '@fe/support/env'
 import { useBus } from '@fe/core/bus'
 import { getColorScheme } from './theme'
 import { registerAction } from '../core/action'
-import { Alt } from '../core/shortcut'
+import { Alt } from '../core/command'
 
 const bus = useBus()
 
diff --git a/src/renderer/services/layout.ts b/src/renderer/services/layout.ts
index abed0487..28079589 100644
--- a/src/renderer/services/layout.ts
+++ b/src/renderer/services/layout.ts
@@ -2,7 +2,7 @@ import { nextTick } from 'vue'
 import store from '@fe/support/store'
 import { useBus } from '@fe/core/bus'
 import { getActionHandler, registerAction } from '../core/action'
-import { Alt } from '../core/shortcut'
+import { Alt } from '../core/command'
 
 const bus = useBus()
 
diff --git a/src/renderer/services/view.ts b/src/renderer/services/view.ts
index c196948f..65f8e68e 100644
--- a/src/renderer/services/view.ts
+++ b/src/renderer/services/view.ts
@@ -1,5 +1,5 @@
 import { useBus } from '@fe/core/bus'
-import { Escape } from '@fe/core/shortcut'
+import { Escape } from '@fe/core/command'
 import { getActionHandler, registerAction } from '@fe/core/action'
 import { useToast } from '@fe/support/ui/toast'
 import store from '@fe/support/store'
diff --git a/src/renderer/startup.ts b/src/renderer/startup.ts
index 8d7cac54..b8156e35 100644
--- a/src/renderer/startup.ts
+++ b/src/renderer/startup.ts
@@ -5,7 +5,7 @@ import store from '@fe/support/store'
 import * as storage from '@fe/utils/storage'
 import { basename } from '@fe/utils/path'
 import type { Doc, Repo } from '@fe/types'
-import { hasCtrlCmd } from '@fe/core/shortcut'
+import { hasCtrlCmd } from '@fe/core/command'
 import { showHelp, switchDoc, unmarkDoc } from '@fe/services/document'
 import { refreshTree } from '@fe/services/tree'
 import { getSelectionInfo, whenEditorReady } from '@fe/services/editor'