增加自动引入 includeTemplates 设置选项,默认引入

ccagml · ccagml · commit 9d440f897d92 · 2023-10-14T10:02:59.000+08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# version 2.19.18
+
+- 使用新的 mvc 代码结构修改 statusBar 相关内容
+- 增加自动引入 includeTemplates 设置选项,默认引入
+
 # version 2.19.17
 
 - 更新基础的分数数据 data.json
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
     "name": "vscode-leetcode-problem-rating",
     "displayName": "LeetCode",
     "description": "%main.description%",
-    "version": "2.19.17",
+    "version": "2.19.18",
     "author": "ccagml",
     "publisher": "ccagml",
     "license": "MIT",
@@ -643,6 +643,11 @@
                             }
                         }
                     },
+                    "leetcode-problem-rating.includeTemplatesAuto": {
+                        "type": "boolean",
+                        "default": true,
+                        "description": "%main.contributes.configuration.properties.leetcode-problem-rating.includeTemplatesAuto.description%"
+                    },
                     "leetcode-problem-rating.hideSolved": {
                         "type": "boolean",
                         "default": false,
diff --git a/package.nls.json b/package.nls.json
@@ -48,6 +48,7 @@
     "main.contributes.submenus.lcpr.setBricksType_sub1.label": "Set repetition time",
     "main.contributes.configuration.title": "leetcode-problem-rating",
     "main.contributes.configuration.properties.leetcode-problem-rating.includeTemplates.description": "Introduce some default content to prevent VSCode from wavy red lines",
+    "main.contributes.configuration.properties.leetcode-problem-rating.includeTemplatesAuto.description": "auto Introduce some default content to prevent VSCode from wavy red lines",
     "main.contributes.configuration.properties.leetcode-problem-rating.includeTemplates.items.properties.language.description": "Programming language",
     "main.contributes.configuration.properties.leetcode-problem-rating.includeTemplates.items.properties.template.description": "template content",
     "main.contributes.configuration.properties.leetcode-problem-rating.hideSolved.description": "Hide solved problems.",
diff --git a/package.nls.zh-cn.json b/package.nls.zh-cn.json
@@ -48,6 +48,7 @@
     "main.contributes.submenus.lcpr.setBricksType_sub1.label": "设置砖头类型",
     "main.contributes.configuration.title": "leetcode-problem-rating",
     "main.contributes.configuration.properties.leetcode-problem-rating.includeTemplates.description": "引入一些默认内容,防止VSCode都是波浪红线",
+    "main.contributes.configuration.properties.leetcode-problem-rating.includeTemplatesAuto.description": "自动引入模板",
     "main.contributes.configuration.properties.leetcode-problem-rating.includeTemplates.items.properties.language.description": "哪种语言",
     "main.contributes.configuration.properties.leetcode-problem-rating.includeTemplates.items.properties.template.description": "模板内容",
     "main.contributes.configuration.properties.leetcode-problem-rating.hideSolved.description": "隐藏已解决的问题",
diff --git a/src/BABA.ts b/src/BABA.ts
@@ -13,8 +13,12 @@ export enum BabaStr {
   every_second = "every_second",
   StatusBarTimeMediator = "StatusBarTimeMediator",
   StatusBarTimeProxy = "StatusBarTimeProxy",
+  RemarkMediator = "RemarkMediator",
+  RemarkProxy = "RemarkProxy",
   submit = "submit",
   showProblemFinish = "showProblemFinish",
+  showProblemFinishOpen = "showProblemFinishOpen",
+  showProblemFinishError = "showProblemFinishError",
   VSCODE_DISPOST = "VSCODE_DISPOST",
   statusBarTime_start = "statusBarTime_start",
   statusBarTime_stop = "statusBarTime_stop",
diff --git a/src/controller/TreeViewController.ts b/src/controller/TreeViewController.ts
@@ -859,10 +859,19 @@ class TreeViewController implements Disposable {
       );
       if (show_code == 100) {
         const promises: any[] = [
-          vscode.window.showTextDocument(vscode.Uri.file(finalPath), {
-            preview: false,
-            viewColumn: vscode.ViewColumn.One,
-          }),
+          vscode.window
+            .showTextDocument(vscode.Uri.file(finalPath), {
+              preview: false,
+              viewColumn: vscode.ViewColumn.One,
+            })
+            .then(
+              (editor) => {
+                eventService.emit("showProblemFinishOpen", node, editor);
+              },
+              (error) => {
+                eventService.emit("showProblemFinishError", node, error);
+              }
+            ),
           promptHintMessage(
             "hint.commentDescription",
             'You can config how to show the problem description through "leetcode-problem-rating.showDescription".',
diff --git a/src/extension.ts b/src/extension.ts
@@ -31,6 +31,7 @@ import { debugContorller } from "./controller/DebugController";
 import { BABA, BabaStr } from "./BABA";
 import { StatusBarTimeMediator, StatusBarTimeProxy } from "./statusBarTime/StatusBarTimeModule";
 import { StatusBarMediator, StatusBarProxy } from "./statusBar/StatusBarModule";
+import { RemarkProxy, RemarkMediator } from "./service/RemarkService";
 
 //==================================BABA========================================
 
@@ -44,7 +45,14 @@ let lcpr_timer;
 export async function activate(context: ExtensionContext): Promise<void> {
   try {
     BABA.init();
-    BABA.regClazz([StatusBarTimeMediator, StatusBarTimeProxy, StatusBarProxy, StatusBarMediator]);
+    BABA.regClazz([
+      StatusBarTimeMediator,
+      StatusBarTimeProxy,
+      StatusBarProxy,
+      StatusBarMediator,
+      RemarkProxy,
+      RemarkMediator,
+    ]);
 
     // 初始化控制器
     mainContorller.initialize(context);
diff --git a/src/rpc/actionChain/chainNode/leetcode.ts b/src/rpc/actionChain/chainNode/leetcode.ts
@@ -445,7 +445,7 @@ and csrf token to the user object and saves the user object to the session. */
             statusMessage: resp.statusMessage,
             msg: "密码错误?",
             msg1: "invalid password?",
-            msg2: "要是用浏览器在力扣官网登录过账号还没过期, 插件的登录会被拒绝,使得登录失败",
+            msg2: "要是用浏览器在力扣官网登录过账号还没过期, 插件的登录会被拒绝,使得登录失败,尝试用cookie方式登录",
           });
           return cb(_temp_msg);
         }
diff --git a/src/service/EventService.ts b/src/service/EventService.ts
@@ -52,6 +52,12 @@ class EventService extends EventEmitter {
     this.on("showProblemFinish", (node: IProblem) => {
       BABA.sendNotification(BabaStr.showProblemFinish, node);
     });
+    this.on("showProblemFinishOpen", (node: IProblem, editor) => {
+      BABA.sendNotification(BabaStr.showProblemFinishOpen, { node: node, editor: editor });
+    });
+    this.on("showProblemFinishError", (node: IProblem, error) => {
+      BABA.sendNotification(BabaStr.showProblemFinishError, { node: node, error: error });
+    });
 
     this.on("groupUpdate", () => {
       bricksDataService.refresh();
diff --git a/src/service/RemarkService.ts b/src/service/RemarkService.ts
@@ -14,7 +14,8 @@ import {
 import { treeViewController } from "../controller/TreeViewController";
 import { remarkDao } from "../dao/remarkDao";
 import { RemarkComment } from "../model/Model";
-import { getIncludeTemplate } from "../utils/ConfigUtils";
+import { includeTemplatesAuto, getIncludeTemplate } from "../utils/ConfigUtils";
+import { BABAMediator, BABAProxy, BaseCC, BabaStr } from "../BABA";
 
 class RemarkService implements Disposable {
   private _remarkComment;
@@ -59,6 +60,10 @@ class RemarkService implements Disposable {
     }
     for (let i: number = 0; i < document.lineCount; i++) {
       const lineContent: string = document.lineAt(i).text;
+      // 有了就不添加了
+      if (lineContent.indexOf("@lcpr-template-start") >= 0) {
+        break;
+      }
 
       if (lineContent.indexOf("@lc code=start") >= 0) {
         const editor = window.activeTextEditor;
@@ -193,3 +198,33 @@ class RemarkService implements Disposable {
 }
 
 export const remarkService: RemarkService = new RemarkService();
+
+export class RemarkProxy extends BABAProxy {
+  static NAME = BabaStr.RemarkProxy;
+  constructor() {
+    super(RemarkProxy.NAME);
+  }
+}
+
+export class RemarkMediator extends BABAMediator {
+  static NAME = BabaStr.RemarkMediator;
+  constructor() {
+    super(RemarkMediator.NAME);
+  }
+
+  listNotificationInterests(): string[] {
+    return [BabaStr.showProblemFinishOpen];
+  }
+  handleNotification(_notification: BaseCC.BaseCC.INotification) {
+    switch (_notification.getName()) {
+      case BabaStr.showProblemFinishOpen:
+        let temp_doc = window.activeTextEditor?.document;
+        if (temp_doc != undefined && includeTemplatesAuto()) {
+          remarkService.includeTemplates(temp_doc);
+        }
+        break;
+      default:
+        break;
+    }
+  }
+}
diff --git a/src/utils/ConfigUtils.ts b/src/utils/ConfigUtils.ts
@@ -402,17 +402,49 @@ export function isAnswerDiffColor(): boolean {
   return getVsCodeConfig().get<boolean>("answerDiffColor", false);
 }
 
+const singleLineFlag = {
+  bash: "#",
+  c: "//",
+  cpp: "//",
+  csharp: "//",
+  golang: "//",
+  java: "//",
+  javascript: "//",
+  kotlin: "//",
+  mysql: "--",
+  php: "//",
+  python: "#",
+  python3: "#",
+  ruby: "#",
+  rust: "//",
+  scala: "//",
+  swift: "//",
+  typescript: "//",
+};
+
+export function includeTemplatesAuto() {
+  return getVsCodeConfig().get<boolean>("includeTemplatesAuto", true);
+}
+
 export function getIncludeTemplate(lang: string): string {
   let temp_cfg = getVsCodeConfig().get<any>("includeTemplates") || [];
   let result = "";
+  let singleLine = singleLineFlag[lang] || "";
   temp_cfg.forEach((element) => {
     if (element.language == lang) {
       result = (element.template || []).join("\n");
       return;
     }
   });
 
-  return result;
+  let new_include_template: any = [
+    `\n`,
+    `${singleLine} @lcpr-template-start`,
+    `${result}`,
+    `${singleLine} @lcpr-template-end`,
+  ];
+
+  return new_include_template.join("\n");
 }
 
 // 获取清除缓存修改时间间隔

Original file line number	Diff line number	Diff line change
`@@ -445,7 +445,7 @@ and csrf token to the user object and saves the user object to the session. */`
`445`	`445`	`statusMessage: resp.statusMessage,`
`446`	`446`	`msg: "密码错误?",`
`447`	`447`	`msg1: "invalid password?",`
`448`		`- msg2: "要是用浏览器在力扣官网登录过账号还没过期, 插件的登录会被拒绝,使得登录失败",`
	`448`	`+ msg2: "要是用浏览器在力扣官网登录过账号还没过期, 插件的登录会被拒绝,使得登录失败,尝试用cookie方式登录",`
`449`	`449`	`});`
`450`	`450`	`return cb(_temp_msg);`
`451`	`451`	`}`