From 8461f78c034e03b81502b8a17dd9da4395838f5f Mon Sep 17 00:00:00 2001
From: Zhichao Jin <jinzcdev@icloud.com>
Date: Wed, 15 Feb 2023 20:26:59 +0800
Subject: [PATCH] fix(note): parse the note in markdown

- improve the style of the note
- remove the notes and leading-trailing blank lines & spaces in program
---
 .vscodeignore                     |  3 +-
 src/webview/ptaPreviewProvider.ts | 71 +++++++++++--------------------
 src/webview/views/ProblemView.ts  | 27 ++++++++++++
 3 files changed, 54 insertions(+), 47 deletions(-)

diff --git a/.vscodeignore b/.vscodeignore
index 083d35c..66e8f17 100644
--- a/.vscodeignore
+++ b/.vscodeignore
@@ -15,4 +15,5 @@ test/**
 package-lock.json
 .github
 resources/pta_template
-tmp/
\ No newline at end of file
+tmp/
+*.vsix
\ No newline at end of file
diff --git a/src/webview/ptaPreviewProvider.ts b/src/webview/ptaPreviewProvider.ts
index cbc7783..e7c727e 100644
--- a/src/webview/ptaPreviewProvider.ts
+++ b/src/webview/ptaPreviewProvider.ts
@@ -166,6 +166,12 @@ class PtaPreviewProvider extends PtaWebview {
                     content: "Click to Copy";
                     z-index: 2;
                 }
+
+                .pta-note {
+                    border: 1px solid var(--vscode-editor-foreground);
+                    border-radius: 5px;
+                    padding: 4px 16px;
+                }
             </style>
             
             <style>
@@ -202,10 +208,6 @@ class PtaPreviewProvider extends PtaWebview {
 
     protected getContent(data: ProblemView): string {
         const keyword: string = `${data.label} ${data.title}`.replace(/ /g, '+');
-        let noteBlock = "";
-        if (data.lastSubmissionId !== "0") {
-            noteBlock = this.parseNoteBlock(data.lastProgram, "@pintia note=start", "@pintia note=end");
-        }
         return `
             <div class="banner" >
                 <div class="banner-header">
@@ -222,20 +224,22 @@ class PtaPreviewProvider extends PtaWebview {
 
 
             ${markdownEngine.render([
-                "-----",
-                `[Google](https://www.google.com/search?q=${keyword})`,
-                " | ",
-                `[Baidu](https://www.baidu.com/s?wd=${keyword})`,
-                " | ",
-                `[Bing](https://cn.bing.com/search?q=${keyword})`,
-                " | ",
-                `[Solution](https://github.com/jinzcdev/PTA/tree/main/${this.formatProblemSetName(data.problemSetName)})`
-            ].join("\n"))}
-
-            ${noteBlock ? markdownEngine.render([
-                "### Notebook",
-                noteBlock
-            ].join("\n")) : ""}
+            "-----",
+            `[Google](https://www.google.com/search?q=${keyword})`,
+            " | ",
+            `[Baidu](https://www.baidu.com/s?wd=${keyword})`,
+            " | ",
+            `[Bing](https://cn.bing.com/search?q=${keyword})`,
+            " | ",
+            `[Solution](https://github.com/jinzcdev/PTA/tree/main/${this.formatProblemSetName(data.problemSetName)})`
+        ].join("\n"))}
+
+            ${data.problemNote ? `
+                <h3>Problem Note</h3>
+                <div class="pta-note">
+                    ${markdownEngine.render(data.problemNote)}
+                </div>
+            ` : ""}
 
             ${(data.lastSubmissionId !== "0" && data.lastProgram.trim().length) ?
                 markdownEngine.render([
@@ -289,36 +293,11 @@ class PtaPreviewProvider extends PtaWebview {
         name = name.replace(/（/g, "(")
             .replace(/）/g, ")")
             .replace(/[ 《》—、-]/g, "_")
-        while (name.length > 0 && name[0] === '_') name = name.substring(1);
-        while (name.length > 0 && name[name.length - 1] === '_') name = name.substring(0, name.length - 1);
-        let s = "";
-        for (let i = 0; i < name.length; i++) {
-            if (name[i] != '_' || (i != name.length - 1 && name[i + 1] != '_')) {
-                s += name[i];
-            }
-        }
-        return s;
+            .replace(/^_+|_+$/g, "")
+            .replace(/_+/g, "_");
+        return name;
     }
 
-    private parseNoteBlock(data: string, start: string, end: string): string {
-        if (!data || data.trim().length === 0) {
-            return "";
-        }
-        let note: string = "";
-        const lines: string[] = data.split('\n');
-        let startLine: number = -1;
-        for (let i = 0; i < lines.length; i++) {
-            if (lines[i].indexOf(start) != -1) {
-                startLine = i + 1;
-            } else if (lines[i].indexOf(end) != -1 && startLine != -1 && startLine < i) {
-                const code: string = lines.slice(startLine, i).join("\n");
-                if (!code.trim().length) continue;
-                note = lines.slice(startLine, i).join("\n");
-                break;
-            }
-        }
-        return note;
-    }
 }
 
 export const ptaPreviewProvider: PtaPreviewProvider = new PtaPreviewProvider();
diff --git a/src/webview/views/ProblemView.ts b/src/webview/views/ProblemView.ts
index 87a5c9d..4395707 100644
--- a/src/webview/views/ProblemView.ts
+++ b/src/webview/views/ProblemView.ts
@@ -23,6 +23,7 @@ export class ProblemView {
     public score: number = 0;
     public submitCount: number = 0;
     public acceptCount: number = 0;
+    public problemNote: string = "";
 
     private problem!: IProblem;
 
@@ -53,6 +54,7 @@ export class ProblemView {
         this.submitCount = problemInfo.submitCount;
         this.lastSubmittedLang = this.getLastSubmittedLang();
         this.lastProgram = this.getLastSubmittedProgram();
+        [this.problemNote, this.lastProgram] = this.parseProblemNote(this.lastProgram, "@pintia note=start", "@pintia note=end");
     }
 
     private getLastSubmittedLang(): string {
@@ -89,4 +91,29 @@ export class ProblemView {
             ?? "";
     }
 
+    private parseProblemNote(data: string, start: string, end: string): [string, string] {
+        if (!data || data.trim().length === 0) {
+            return ["", ""];
+        }
+        let note: string = "";
+        const lines: string[] = data.split('\n');
+        let startLine: number = -1, endLine: number = -1;
+        for (let i = 0; i < lines.length; i++) {
+            if (lines[i].indexOf(start) != -1) {
+                startLine = i + 1;
+            } else if (lines[i].indexOf(end) != -1 && startLine != -1 && startLine < i) {
+                const code: string = lines.slice(startLine, i).join("\n");
+                if (!code.trim().length) continue;
+                note = lines.slice(startLine, i).join("\n");
+                endLine = i - 1;
+                break;
+            }
+        }
+        if (startLine == -1 || endLine == -1) {
+            return ["", data];
+        }
+        let newData = lines.filter((line, index) => index < startLine - 1 || index > endLine + 1).join("\n");
+        return [note, newData.replace(/^\s+|\s+$/g, "").replace(/```/g, "\\```")];
+    }
+
 }
\ No newline at end of file