fix: clickTagA

weirongxu · Jan 6, 2023 · f57e37d · f57e37d
1 parent b29e10e
commit f57e37d
Show file tree

Hide file tree

Showing 6 changed files with 674 additions and 653 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -1,3 +1,4 @@
 {
-  "extends": ["@raidou/eslint-config-base"]
+  "extends": ["@raidou/eslint-config-base"],
+  "env": { "node": true }
 }
diff --git a/esbuild.js b/esbuild.js
@@ -1,4 +1,6 @@
+/* eslint-disable no-console */
 /* eslint-disable @typescript-eslint/no-var-requires */
+
 async function start(watch) {
   await require('esbuild').build({
     entryPoints: {

diff --git a/package.json b/package.json
@@ -40,11 +40,12 @@
     "@types/rimraf": "^3.0.2",
     "@types/uuid": "^8.3.4",
     "coc-helper": "^0.15.2",
-    "coc-webview": "^0.11.2",
-    "coc.nvim": "^0.0.82",
-    "esbuild": "^0.15.12",
+    "coc-webview": "^0.12.0",
+    "coc.nvim": "^0.0.83-next.9",
+    "esbuild": "^0.16.14",
     "esbuild-plugin-alias": "^0.2.1",
     "eslint": "^8.26.0",
+    "isbinaryfile": "^5.0.0",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.7.1",
     "rimraf": "^3.0.2",

diff --git a/src/index.ts b/src/index.ts
@@ -1,5 +1,5 @@
 import { getExtensionConfigPath, utility } from '@shd101wyy/mume';
-import {} from 'coc-helper';
+import { isBinaryFile } from 'isbinaryfile';
 import {
   commands,
   events,
@@ -13,7 +13,6 @@ import {
   workspace,
 } from 'coc.nvim';
 import path from 'path';
-import { URL } from 'url';
 import { pasteImageFile, uploadImageFile } from './image-helper';
 import {
   getPreviewUri,
@@ -59,10 +58,10 @@ export function activate(context: ExtensionContext) {
     await contentProvider.initPreview(resource, doc, openURL);
   }
 
-  function toggleScrollSync() {
+  async function toggleScrollSync() {
     const config = workspace.getConfiguration('markdown-preview-enhanced');
     const scrollSync = !config.get<boolean>('scrollSync');
-    config.update('scrollSync', scrollSync, true);
+    await config.update('scrollSync', scrollSync, true);
     contentProvider.updateConfiguration();
     if (scrollSync) {
       void window.showInformationMessage('Scroll Sync is enabled');
@@ -71,10 +70,10 @@ export function activate(context: ExtensionContext) {
     }
   }
 
-  function toggleLiveUpdate() {
+  async function toggleLiveUpdate() {
     const config = workspace.getConfiguration('markdown-preview-enhanced');
     const liveUpdate = !config.get<boolean>('liveUpdate');
-    config.update('liveUpdate', liveUpdate, true);
+    await config.update('liveUpdate', liveUpdate, true);
     contentProvider.updateConfiguration();
     if (liveUpdate) {
       void window.showInformationMessage('Live Update is enabled');
@@ -83,10 +82,10 @@ export function activate(context: ExtensionContext) {
     }
   }
 
-  function toggleBreakOnSingleNewLine() {
+  async function toggleBreakOnSingleNewLine() {
     const config = workspace.getConfiguration('markdown-preview-enhanced');
     const breakOnSingleNewLine = !config.get<boolean>('breakOnSingleNewLine');
-    config.update('breakOnSingleNewLine', breakOnSingleNewLine, true);
+    await config.update('breakOnSingleNewLine', breakOnSingleNewLine, true);
     contentProvider.updateConfiguration();
     if (breakOnSingleNewLine) {
       void window.showInformationMessage('Break On Single New Line is enabled');
@@ -319,24 +318,22 @@ export function activate(context: ExtensionContext) {
     });
   }
 
-  async function clickTagA(uri: string, href: string) {
+  async function clickTagA(sourceUri: string, href: string) {
     const util = getWebviewAPI().util;
     const curDoc = await workspace.document;
     href = decodeURIComponent(href);
     if (!href) {
       return;
     }
-    if (
-      ['.pdf', '.xls', '.xlsx', '.doc', '.ppt', '.docx', '.pptx'].indexOf(
-        path.extname(uri),
-      ) >= 0
-    ) {
-      util.openUri(href);
-    } else {
-      const url = new URL(href);
-      const openType = curDoc.uri === uri ? 'edit' : 'vsplit';
-      await openInVim(Uri.parse(url.pathname), openType);
+    const resourceUri = util.parseResourceUri(href);
+    if (resourceUri?.localPath) {
+      const openType = curDoc.uri === sourceUri ? 'edit' : 'vsplit';
+      const hrefUri = Uri.parse(resourceUri.localPath);
+      if (!(await isBinaryFile(hrefUri.fsPath)))
+        await openInVim(hrefUri, openType);
+      return;
     }
+    util.openExternalUri(href);
   }
 
   async function clickTaskListCheckbox(uri: string, dataLine: string) {
@@ -363,9 +360,9 @@ export function activate(context: ExtensionContext) {
     ]);
   }
 
-  function setPreviewTheme(_uri: string, theme: string) {
+  async function setPreviewTheme(_uri: string, theme: string) {
     const config = workspace.getConfiguration('markdown-preview-enhanced');
-    config.update('previewTheme', theme, true);
+    await config.update('previewTheme', theme, true);
   }
 
   context.subscriptions.push(
@@ -467,17 +464,17 @@ export function activate(context: ExtensionContext) {
   }))
   */
 
-  const registerCommand = (cmd: string, impl: (...args: unknown[]) => void) =>
-    commands.registerCommand(cmd, logger.asyncCatch(impl));
+  const registerCommand = (
+    cmd: string,
+    impl: (...args: any[]) => void | Promise<void>,
+  ) => commands.registerCommand(cmd, logger.asyncCatch(impl));
 
   context.subscriptions.push(
-    registerCommand(
-      'markdown-preview-enhanced.openPreview',
-      logger.asyncCatch(() => openPreview(true)),
+    registerCommand('markdown-preview-enhanced.openPreview', () =>
+      openPreview(true),
     ),
-    registerCommand(
-      'markdown-preview-enhanced.openPreviewBackground',
-      logger.asyncCatch(() => openPreview(false)),
+    registerCommand('markdown-preview-enhanced.openPreviewBackground', () =>
+      openPreview(false),
     ),
     registerCommand(
       'markdown-preview-enhanced.toggleScrollSync',
@@ -493,102 +490,63 @@ export function activate(context: ExtensionContext) {
     ),
     registerCommand(
       'markdown-preview-enhanced.openImageHelper',
-      logger.asyncCatch(openImageHelper),
+      openImageHelper,
     ),
     registerCommand(
       'markdown-preview-enhanced.runAllCodeChunks',
-      logger.asyncCatch(runAllCodeChunksCommand),
+      runAllCodeChunksCommand,
     ),
     registerCommand(
       'markdown-preview-enhanced.runCodeChunk',
-      logger.asyncCatch(runCodeChunkCommand),
-    ),
-    registerCommand(
-      'markdown-preview-enhanced.syncPreview',
-      logger.asyncCatch(syncPreview),
-    ),
-    registerCommand(
-      'markdown-preview-enhanced.customizeCss',
-      logger.asyncCatch(customizeCSS),
+      runCodeChunkCommand,
     ),
+    registerCommand('markdown-preview-enhanced.syncPreview', syncPreview),
+    registerCommand('markdown-preview-enhanced.customizeCss', customizeCSS),
     registerCommand(
       'markdown-preview-enhanced.openMermaidConfig',
-      logger.asyncCatch(openMermaidConfig),
+      openMermaidConfig,
     ),
     registerCommand(
       'markdown-preview-enhanced.openMathJaxConfig',
-      logger.asyncCatch(openMathJaxConfig),
+      openMathJaxConfig,
     ),
     registerCommand(
       'markdown-preview-enhanced.openKaTeXConfig',
-      logger.asyncCatch(openKaTeXConfig),
-    ),
-    registerCommand(
-      'markdown-preview-enhanced.extendParser',
-      logger.asyncCatch(extendParser),
+      openKaTeXConfig,
     ),
+    registerCommand('markdown-preview-enhanced.extendParser', extendParser),
     registerCommand(
       'markdown-preview-enhanced.showUploadedImages',
-      logger.asyncCatch(showUploadedImages),
-    ),
-    registerCommand(
-      'markdown-preview-enhanced.insertNewSlide',
-      logger.asyncCatch(insertNewSlide),
-    ),
-    registerCommand(
-      'markdown-preview-enhanced.insertTable',
-      logger.asyncCatch(insertTable),
+      showUploadedImages,
     ),
+    registerCommand('markdown-preview-enhanced.insertNewSlide', insertNewSlide),
+    registerCommand('markdown-preview-enhanced.insertTable', insertTable),
     registerCommand(
       'markdown-preview-enhanced.insertPagebreak',
-      logger.asyncCatch(insertPagebreak),
-    ),
-    registerCommand(
-      'markdown-preview-enhanced.createTOC',
-      logger.asyncCatch(createTOC),
-    ),
-    registerCommand('_mume.revealLine', logger.asyncCatch(revealLine)),
-    registerCommand('_mume.insertImageUrl', logger.asyncCatch(insertImageUrl)),
-    registerCommand('_mume.pasteImageFile', logger.asyncCatch(pasteImageFile)),
-    registerCommand(
-      '_mume.uploadImageFile',
-      logger.asyncCatch(uploadImageFile),
-    ),
-    registerCommand('_mume.refreshPreview', logger.asyncCatch(refreshPreview)),
-    registerCommand('_mume.openInBrowser', logger.asyncCatch(openInBrowser)),
-    registerCommand('_mume.htmlExport', logger.asyncCatch(htmlExport)),
-    registerCommand('_mume.chromeExport', logger.asyncCatch(chromeExport)),
-    registerCommand('_mume.princeExport', logger.asyncCatch(princeExport)),
-    registerCommand('_mume.eBookExport', logger.asyncCatch(eBookExport)),
-    registerCommand('_mume.pandocExport', logger.asyncCatch(pandocExport)),
-    registerCommand('_mume.markdownExport', logger.asyncCatch(markdownExport)),
-    registerCommand(
-      '_mume.webviewFinishLoading',
-      logger.asyncCatch(webviewFinishLoading),
+      insertPagebreak,
     ),
+    registerCommand('markdown-preview-enhanced.createTOC', createTOC),
+    registerCommand('_mume.revealLine', revealLine),
+    registerCommand('_mume.insertImageUrl', insertImageUrl),
+    registerCommand('_mume.pasteImageFile', pasteImageFile),
+    registerCommand('_mume.uploadImageFile', uploadImageFile),
+    registerCommand('_mume.refreshPreview', refreshPreview),
+    registerCommand('_mume.openInBrowser', openInBrowser),
+    registerCommand('_mume.htmlExport', htmlExport),
+    registerCommand('_mume.chromeExport', chromeExport),
+    registerCommand('_mume.princeExport', princeExport),
+    registerCommand('_mume.eBookExport', eBookExport),
+    registerCommand('_mume.pandocExport', pandocExport),
+    registerCommand('_mume.markdownExport', markdownExport),
+    registerCommand('_mume.webviewFinishLoading', webviewFinishLoading),
     // registerCommand('_mume.cacheSVG', cacheSVG),
-    registerCommand(
-      '_mume.cacheCodeChunkResult',
-      logger.asyncCatch(cacheCodeChunkResult),
-    ),
-    registerCommand('_mume.runCodeChunk', logger.asyncCatch(runCodeChunk)),
-    registerCommand(
-      '_mume.runAllCodeChunks',
-      logger.asyncCatch(runAllCodeChunks),
-    ),
-    registerCommand('_mume.clickTagA', logger.asyncCatch(clickTagA)),
-    registerCommand(
-      '_mume.clickTaskListCheckbox',
-      logger.asyncCatch(clickTaskListCheckbox),
-    ),
-    registerCommand(
-      '_mume.showUploadedImageHistory',
-      logger.asyncCatch(showUploadedImages),
-    ),
-    registerCommand(
-      '_mume.setPreviewTheme',
-      logger.asyncCatch(setPreviewTheme),
-    ),
+    registerCommand('_mume.cacheCodeChunkResult', cacheCodeChunkResult),
+    registerCommand('_mume.runCodeChunk', runCodeChunk),
+    registerCommand('_mume.runAllCodeChunks', runAllCodeChunks),
+    registerCommand('_mume.clickTagA', clickTagA),
+    registerCommand('_mume.clickTaskListCheckbox', clickTaskListCheckbox),
+    registerCommand('_mume.showUploadedImageHistory', showUploadedImages),
+    registerCommand('_mume.setPreviewTheme', setPreviewTheme),
   );
 }
 

diff --git a/src/util.ts b/src/util.ts
@@ -13,8 +13,9 @@ export const getWebviewAPI = () => {
       | undefined;
   }
   if (!webviewExt) {
-    void window.showErrorMessage('Please install the coc-webview extension');
-    throw new Error('Please install the coc-webview extension');
+    const prompt = 'Please install the coc-webview extension';
+    void window.showErrorMessage(prompt);
+    throw new Error(prompt);
   }
   return webviewExt.exports;
 };