🐛 Unable to render when image link is absolute path. TobiasTao#11

dmi · Oct 28, 2020 · fa2cc68 · fa2cc68
1 parent 859dabe
commit fa2cc68
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 35 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -77,7 +77,10 @@
           "type": "string",
           "default": "KaTeX",
           "description": "Mathematical formula rendering engine",
-          "enum": ["KaTeX", "MathJax"]
+          "enum": [
+            "KaTeX",
+            "MathJax"
+          ]
         },
         "vscode-md.options.preview.math.macros": {
           "type": "object",
@@ -229,7 +232,7 @@
     "webpack-cli": "^3.3.12"
   },
   "dependencies": {
-    "vditor": "^3.5.5"
+    "vditor": "^3.6.0"
   },
   "keywords": [
     "markdown",

diff --git a/src/mdEditor.ts b/src/mdEditor.ts
@@ -46,6 +46,8 @@ export class MarkdownEditorProvider implements vscode.CustomTextEditorProvider {
             .toString(true)
             .replace(/\/[^\/]+?\.\w+$/, '/');
 
+        let linkPrefix = '';
+
         const extConfig = vscode.workspace.getConfiguration('vscode-md');
 
         // image dir(fsPath)
@@ -67,7 +69,7 @@ export class MarkdownEditorProvider implements vscode.CustomTextEditorProvider {
                 }
             }
         } else if (extConfig.image.pathType === 'absolute') {
-            linkBase = linkBase.split('///')[0] + '///';
+            linkPrefix = linkBase.split('///')[0] + '///';
             if (path.isAbsolute(extConfig.image.dirPath)) {
                 imgPathPrefix = extConfig.image.dirPath;
                 imgStoreDir = imgPathPrefix;
@@ -93,6 +95,7 @@ export class MarkdownEditorProvider implements vscode.CustomTextEditorProvider {
                 preview: {
                     markdown: {
                         linkBase: linkBase,
+                        linkPrefix,
                         mark: extConfig.options.preview.markdown.mark
                     },
                     math: extConfig.options.preview.math,

diff --git a/src/utils.ts b/src/utils.ts
@@ -4,18 +4,18 @@ import { window } from 'vscode';
 import { IImgInfo } from 'picgo/dist/src/utils/interfaces';
 
 export function formatString(tplString: string, data: IUploadName | IOutputUrl) {
-  const keys = Object.keys(data);
-  const values = keys.map((k) => data[k]);
-  return new Function(keys.join(','), 'return `' + tplString + '`').apply(null, values);
+    const keys = Object.keys(data);
+    const values = keys.map((k) => data[k]);
+    return new Function(keys.join(','), 'return `' + tplString + '`').apply(null, values);
 }
 
 const nls = require('../package.nls.json');
 
 function addPeriod(message: string) {
-  if (!message.endsWith('.') && !message.endsWith('!')) {
-    message = message + '.';
-  }
-  return message;
+    if (!message.endsWith('.') && !message.endsWith('!')) {
+        message = message + '.';
+    }
+    return message;
 }
 
 // export function showWarning(message: string) {
@@ -24,36 +24,36 @@ function addPeriod(message: string) {
 // }
 
 export function showError(message: string) {
-  message = addPeriod(message);
-  window.showErrorMessage(`${nls['ext.displayName']}: ${message}`);
+    message = addPeriod(message);
+    window.showErrorMessage(`${nls['ext.displayName']}: ${message}`);
 }
 
-// export function showInfo(message: string) {
-//   message = addPeriod(message);
-//   window.showInformationMessage(`${nls['ext.displayName']}: ${message}`);
-// }
+export function showInfo(message: string) {
+    message = addPeriod(message);
+    window.showInformationMessage(`${nls['ext.displayName']}: ${message}`);
+}
 
 export function getUploadedName(imgInfo: IImgInfo): string {
-  let fullName;
-  if (!imgInfo.fileName) {
-    fullName = '';
-  } else {
-    fullName = imgInfo.fileName as string;
-  }
-  let basename = path.basename(fullName, path.extname(fullName));
-  return basename;
+    let fullName;
+    if (!imgInfo.fileName) {
+        fullName = '';
+    } else {
+        fullName = imgInfo.fileName as string;
+    }
+    let basename = path.basename(fullName, path.extname(fullName));
+    return basename;
 }
 
 export function getNonce() {
-  let text = '';
-  const possible = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
-  for (let i = 0; i < 32; i++) {
-    text += possible.charAt(Math.floor(Math.random() * possible.length));
-  }
-  return text;
+    let text = '';
+    const possible = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+    for (let i = 0; i < 32; i++) {
+        text += possible.charAt(Math.floor(Math.random() * possible.length));
+    }
+    return text;
 }
 
 export function genImgName(): number {
-  var date = new Date(Date.now());
-  return date.getTime();
+    var date = new Date(Date.now());
+    return date.getTime();
 }