Merge branch 'main' into patch

src/codelens/CustomCodeLensProvider.ts

@@ -17,13 +17,6 @@ export class CustomCodeLensProvider implements vscode.CodeLensProvider {
     document: vscode.TextDocument
   ): vscode.ProviderResult<vscode.CodeLens[]> {
     const content: string = document.getText();
-    // const matchResult: RegExpMatchArray | null = content.match(
-    //   "*[interview]: start"
-    // );
-    // console.log(matchResult)
-    // if (!matchResult) {
-    //   return undefined;
-    // }
 
     let codeLensLine: number = document.lineCount - 1;
     for (let i: number = document.lineCount - 1; i >= 0; i--) {
@@ -34,6 +27,13 @@ export class CustomCodeLensProvider implements vscode.CodeLensProvider {
       }
     }
 
+    if (
+      content.indexOf("*[interview]: start") < 0 ||
+      content.indexOf("*[interview]: end") < 0
+    ) {
+      return [];
+    }
+
     const range: vscode.Range = new vscode.Range(
       codeLensLine,
       0,
@@ -46,15 +46,15 @@ export class CustomCodeLensProvider implements vscode.CodeLensProvider {
       new vscode.CodeLens(range, {
         title: "提交答案",
         command: "interview.postAnswer",
-        arguments: [document.uri],
+        arguments: [document],
       })
     );
 
     codeLens.push(
       new vscode.CodeLens(range, {
         title: "查看题解",
         command: "interview.openAnswer",
-        arguments: [document.uri],
+        arguments: [document],
       })
     );
     return codeLens;

src/command/openQuestion.ts

@@ -1,28 +1,26 @@
 import { resolve } from "path";
 import * as fse from "fs-extra";
-import client from "../mock";
 import { selectWorkspaceFolder } from "../shared/selectWorkspaceFolder";
 import { Uri, ViewColumn, window } from "vscode";
 import { ListItem } from "../service";
 import { filterInvalidPath } from "../shared";
 
 export async function openQuestion(ele: ListItem): Promise<void> {
-	const { name, type, content } = ele;
-
-	const workspaceFolder: string = await selectWorkspaceFolder();
-	if (!workspaceFolder) {
-		return;
-	}
-	const codeTemplate = getCodeTemplate(type, content);
-	const finalPath = await showProblem(
-		resolve(workspaceFolder, filterInvalidPath(name) + "." + type),
-		codeTemplate || ""
-	);
-	await window.showTextDocument(Uri.file(finalPath), {
-		preview: false,
-		viewColumn: ViewColumn.One,
-	});
-	return;
+  const { name, type, content, day_id } = ele;
+  const workspaceFolder: string = await selectWorkspaceFolder();
+  if (!workspaceFolder) {
+    return;
+  }
+  const codeTemplate = getCodeTemplate(type, content);
+  const finalPath = await showProblem(
+    resolve(workspaceFolder, day_id + "." + filterInvalidPath(name) + "." + type),
+    codeTemplate || ""
+  );
+  await window.showTextDocument(Uri.file(finalPath), {
+    preview: false,
+    viewColumn: ViewColumn.One,
+  });
+  return;
 }
 
 async function showProblem(filePath: string, codeTemplate: string) {

src/extension.ts

@@ -8,15 +8,16 @@ export async function activate(
 ): Promise<void> {
   try {
     // -------- interview 相关 -------------
-    const interviewProvider = new Interview();
+    const interviewProvider = new Interview(context);
     window.createTreeView("interview", {
       treeDataProvider: interviewProvider,
     });
     commands.registerCommand("interview.openQuestion", (ele) => {
       openQuestion(ele);
     });
-    commands.registerCommand("interview.refresh", (name, index) => {
-      vscode.window.showInformationMessage("刷新数据");
+    commands.registerCommand("interview.refresh", () => {
+      interviewProvider.refresh();
+      vscode.window.showInformationMessage("刷新");
     });
     commands.registerCommand("interview.openAnswer", (name, index) => {
       vscode.window.showInformationMessage("查看答案");

src/service/index.ts

@@ -22,12 +22,11 @@ interface IListQuery {
 }
 
 export interface ListItem {
-	name: string;
-	id: number;
-	// eslint-disable-next-line @typescript-eslint/naming-convention
-	publish_date: Date | string;
-	content: string;
-	type: "md" | "js";
+  name: string,
+  day_id: number,
+  publish_date: string,
+  content: string,
+  type: 'md' | 'js'
 }
 
 type IListRes = IRes<ListItem[]>;

src/treeview/interviewTreeView.ts

@@ -4,32 +4,44 @@ import {
   TreeItem,
   TreeDataProvider,
   Event,
+  EventEmitter,
+  window,
 } from "vscode";
+import * as vscode from "vscode";
 import * as path from "path";
 import { getProblemList } from "../service";
 
 export class Interview implements TreeDataProvider<Question> {
-  onDidChangeTreeData?: Event<void | Question | null | undefined> | undefined;
+  constructor(private context?: vscode.ExtensionContext) {}
+
+  private _onDidChangeTreeData: EventEmitter<any> = new EventEmitter<any>();
+
+  readonly onDidChangeTreeData: Event<any> = this._onDidChangeTreeData.event;
   getTreeItem(element: Question): TreeItem {
     return element;
   }
   getChildren(element?: Question): ProviderResult<Question[]> {
     return this.getQuestions();
-    throw new Error("Method not implemented.");
   }
+
+  refresh() {
+    this._onDidChangeTreeData.fire(undefined);
+  }
+
   async getQuestions() {
     try {
       let result = await getProblemList();
       let arr = result.data.map(
         (ele, index) =>
-          new Question(ele.name, {
+          new Question(`${ele.day_id}.${ele.name}`, ele.publish_date, {
             command: "interview.openQuestion",
             title: "",
             arguments: [ele],
-          })
+          }, this.context, index === 0 ? true : false)
       );
       return arr;
     } catch (e) {
+      window.showErrorMessage("获取数据失败，请稍后刷新！");
       console.log(e);
     }
   }
@@ -38,29 +50,17 @@ export class Interview implements TreeDataProvider<Question> {
 export class Question extends TreeItem {
   constructor(
     public readonly label: string,
-    // public readonly url: string,
-    public readonly command?: Command
+    public readonly date: string,
+    public readonly command?: Command,
+    public readonly context?: vscode.ExtensionContext,
+    public readonly isNew: boolean = false
   ) {
     super(label);
     this.tooltip = `${this.label}`;
+    this.description = `${this.date}`;
   }
 
-  iconPath = {
-    light: path.join(
-      __filename,
-      "..",
-      "..",
-      "resources",
-      "light",
-      "dependency.svg"
-    ),
-    dark: path.join(
-      __filename,
-      "..",
-      "..",
-      "resources",
-      "dark",
-      "dependency.svg"
-    ),
-  };
+  public iconPath? = this.isNew
+    ? this.context?.asAbsolutePath(path.join("media", "new.svg"))
+    : "";
 }