Merge pull request #162 from ccagml/main

ccagml · web-flow · commit 683c1e89b79a · 2023-01-28T17:08:25.000+08:00
题解显示 katex 数学公式
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## version 2.13.1
+
+- 题解显示 katex 数学公式
+
 ## version 2.12.3
 
 - hideScore 配置变化时刷新题目列表
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
     "name": "vscode-leetcode-problem-rating",
     "displayName": "LeetCode",
     "description": "LeetCode 官方插件增强, 代码开源, 增加 LeetCode 题目难度分, 给个star吧, 球球了",
-    "version": "2.12.3",
+    "version": "2.13.1",
     "author": "ccagml",
     "publisher": "ccagml",
     "license": "MIT",
diff --git a/resources/katexcss/github-markdown.min.css b/resources/katexcss/github-markdown.min.css
diff --git a/resources/katexcss/kates.min.css b/resources/katexcss/kates.min.css
diff --git a/src/service/MarkdownService.ts b/src/service/MarkdownService.ts
@@ -9,6 +9,7 @@
 
 import * as hljs from "highlight.js";
 import * as MarkdownIt from "markdown-it";
+import * as MarkDownItKatex from "markdown-it-katex";
 import * as os from "os";
 import * as path from "path";
 import * as vscode from "vscode";
@@ -30,7 +31,10 @@ class MarkdownService implements vscode.Disposable {
   }
 
   public get localResourceRoots(): vscode.Uri[] {
-    return [vscode.Uri.file(path.join(this.config.extRoot, "media"))];
+    return [
+      vscode.Uri.file(path.join(this.config.extRoot, "media")),
+      vscode.Uri.file(path.join(__dirname, "..", "..", "..", "resources", "katexcss")),
+    ];
   }
 
   public dispose(): void {
@@ -108,6 +112,7 @@ class MarkdownService implements vscode.Disposable {
       },
     });
 
+    md.use(MarkDownItKatex);
     this.addCodeBlockHighlight(md);
     this.addImageUrlCompletion(md);
     this.addLinkValidator(md);
diff --git a/src/service/SolutionService.ts b/src/service/SolutionService.ts
@@ -13,6 +13,8 @@ import { BaseWebViewService } from "./BaseWebviewService";
 import { markdownService } from "./MarkdownService";
 import { IWebViewOption } from "../model/Model";
 
+import * as path from "path";
+
 class SolutionService extends BaseWebViewService {
   protected readonly viewType: string = "leetcode.solution";
   private problemName: string;
@@ -52,16 +54,32 @@ class SolutionService extends BaseWebViewService {
         `| ${lang}  | ${auth}  | ${votes} |`,
       ].join("\n")
     );
+
+    // $\textit
+    this.solution.body = this.solution.body.replace(/\$\textit/g, "$");
+
     const body: string = markdownService.render(this.solution.body, {
       lang: this.solution.lang,
       host: "https://discuss.leetcode.com/",
     });
+    // "<link rel=\"stylesheet\" type=\"text/css\" href=\"vscode-resource:/home/cc/.vscode-server/bin/30d9c6cd9483b2cc586687151bcbcd635f373630/extensions/markdown-language-features/media/markdown.css\">\n<link rel=\"stylesheet\" type=\"text/css\" href=\"vscode-resource:/home/cc/.vscode-server/bin/30d9c6cd9483b2cc586687151bcbcd635f373630/extensions/markdown-language-features/media/highlight.css\">\n<style>\nbody {\n    font-family: -apple-system, BlinkMacSystemFont, 'Segoe WPC', 'Segoe UI', system-ui, 'Ubuntu', 'Droid Sans', sans-serif;\n    font-size: 14px;\n    line-height: 1.6;\n}\n</style>"
+    // <meta http-equiv="Content-Security-Policy" content="default-src 'none'; img-src https:; script-src vscode-resource:; style-src vscode-resource:;"/>
+
     return `
             <!DOCTYPE html>
             <html>
             <head>
-                <meta http-equiv="Content-Security-Policy" content="default-src 'none'; img-src https:; script-src vscode-resource:; style-src vscode-resource:;"/>
+                <meta http-equiv="Content-Security-Policy" content="default-src self; img-src vscode-resource:; script-src vscode-resource: 'self' 'unsafe-inline'; style-src vscode-resource: 'self' 'unsafe-inline'; "/>
                 ${styles}
+                <link rel="stylesheet" type="text/css" href= "vscode-resource:${path.join(
+                  __dirname,
+                  "..",
+                  "..",
+                  "..",
+                  "resources",
+                  "katexcss",
+                  "kates.min.css"
+                )}">
             </head>
             <body class="vscode-body 'scrollBeyondLastLine' 'wordWrap' 'showEditorSelection'" style="tab-size:4">
                 ${head}
