From 589d269ab3e7d2b763bbfc2463bd50b7c7ea7da2 Mon Sep 17 00:00:00 2001
From: iFun <bill.guocheng@gmail.com>
Date: Tue, 1 Oct 2019 11:25:11 -0400
Subject: [PATCH 1/4] added solution link

---
 src/webview/leetCodePreviewProvider.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/webview/leetCodePreviewProvider.ts b/src/webview/leetCodePreviewProvider.ts
index d0378ef8..781be38a 100644
--- a/src/webview/leetCodePreviewProvider.ts
+++ b/src/webview/leetCodePreviewProvider.ts
@@ -73,9 +73,9 @@ class LeetCodePreviewProvider extends LeetCodeWebview {
         const { title, url, category, difficulty, likes, dislikes, body } = this.description;
         const head: string = markdownEngine.render(`# [${title}](${url})`);
         const info: string = markdownEngine.render([
-            `| Category | Difficulty | Likes | Dislikes | [Discuss](${url.replace("/description/", "/discuss/?currentPage=1&orderBy=most_votes&query=")}) |`,
-            `| :------: | :--------: | :---: | :------: | :-----: |`,
-            `| ${category} | ${difficulty} | ${likes} | ${dislikes} | -- |`,
+            `| Category | Difficulty | Likes | Dislikes | [Discuss](${url.replace("/description/", "/discuss/?currentPage=1&orderBy=most_votes&query=")}) | [Solution](${url.replace("/description/", "/solution/")}) |`,
+            `| :------: | :--------: | :---: | :------: | :-----: | :------: |`,
+            `| ${category} | ${difficulty} | ${likes} | ${dislikes} | -- | -- |`,
         ].join("\n"));
         const tags: string = [
             `<details>`,

From 825ca177158b02318669b8c5ca3b440bb152c581 Mon Sep 17 00:00:00 2001
From: Sheng Chen <sheche@microsoft.com>
Date: Wed, 2 Oct 2019 12:58:22 +0800
Subject: [PATCH 2/4] Move the link position to the bottom of the page

---
 ACKNOWLEDGEMENTS.md                    |  4 +++-
 src/webview/leetCodePreviewProvider.ts | 30 +++++++++++++++++++++++---
 2 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/ACKNOWLEDGEMENTS.md b/ACKNOWLEDGEMENTS.md
index 49a975e8..4bc00ba3 100644
--- a/ACKNOWLEDGEMENTS.md
+++ b/ACKNOWLEDGEMENTS.md
@@ -2,6 +2,7 @@
 
 A big thanks to the following individuals for contributing:
 
+- [@JIEJIAN21](https://github.com/JIEJIAN21) - thanks for logo and icon design
 - [@TsFreddie](https://github.com/TsFreddie) — [contributions](https://github.com/jdneo/vscode-leetcode/commits?author=TsFreddie)
 - [@ntt2k](https://github.com/ntt2k) — [contributions](https://github.com/jdneo/vscode-leetcode/commits?author=ntt2k)
 - [@purocean](https://github.com/purocean) — [contributions](https://github.com/jdneo/vscode-leetcode/commits?author=purocean)
@@ -17,4 +18,5 @@ A big thanks to the following individuals for contributing:
 - [@houtianze](https://github.com/houtianze) — [contributions](https://github.com/jdneo/vscode-leetcode/commits?author=houtianze)
 - [@magic-akari](https://github.com/magic-akari) - [contributions](https://github.com/jdneo/vscode-leetcode/commits?author=magic-akari)
 - [@SF-Zhou](https://github.com/SF-Zhou) - [contributions](https://github.com/jdneo/vscode-leetcode/commits?author=SF-Zhou)
-- [@JIEJIAN21](https://github.com/JIEJIAN21) - thanks for logo and icon design
+- [@fuafa](https://github.com/fuafa) - [contributions](https://github.com/jdneo/vscode-leetcode/commits?author=fuafa)
+- [@iFun](https://github.com/iFun) - [contributions](https://github.com/jdneo/vscode-leetcode/commits?author=iFun)
diff --git a/src/webview/leetCodePreviewProvider.ts b/src/webview/leetCodePreviewProvider.ts
index 781be38a..0bd3aaa6 100644
--- a/src/webview/leetCodePreviewProvider.ts
+++ b/src/webview/leetCodePreviewProvider.ts
@@ -73,9 +73,9 @@ class LeetCodePreviewProvider extends LeetCodeWebview {
         const { title, url, category, difficulty, likes, dislikes, body } = this.description;
         const head: string = markdownEngine.render(`# [${title}](${url})`);
         const info: string = markdownEngine.render([
-            `| Category | Difficulty | Likes | Dislikes | [Discuss](${url.replace("/description/", "/discuss/?currentPage=1&orderBy=most_votes&query=")}) | [Solution](${url.replace("/description/", "/solution/")}) |`,
-            `| :------: | :--------: | :---: | :------: | :-----: | :------: |`,
-            `| ${category} | ${difficulty} | ${likes} | ${dislikes} | -- | -- |`,
+            `| Category | Difficulty | Likes | Dislikes |`,
+            `| :------: | :--------: | :---: | :------: |`,
+            `| ${category} | ${difficulty} | ${likes} | ${dislikes} |`,
         ].join("\n"));
         const tags: string = [
             `<details>`,
@@ -97,6 +97,11 @@ class LeetCodePreviewProvider extends LeetCodeWebview {
             ),
             `</details>`,
         ].join("\n");
+        const links: string = markdownEngine.render([
+            `---`,
+            `- [Discussion](${this.getDiscussionLink(url)})`,
+            `- [Solution](${this.getSolutionLink(url)})`,
+        ].join("\n"));
         return `
             <!DOCTYPE html>
             <html>
@@ -114,6 +119,7 @@ class LeetCodePreviewProvider extends LeetCodeWebview {
                 ${tags}
                 ${companies}
                 ${body}
+                ${links}
                 ${!this.sideMode ? button.element : ""}
                 <script>
                     const vscode = acquireVsCodeApi();
@@ -172,6 +178,24 @@ class LeetCodePreviewProvider extends LeetCodeWebview {
             body: body.join("\n").replace(/<pre>[\r\n]*([^]+?)[\r\n]*<\/pre>/g, "<pre><code>$1</code></pre>"),
         };
     }
+
+    private getDiscussionLink(url: string): string {
+        if (url.includes("leetcode-cn.com")) {
+            return url.replace("/description/", "/comments/");
+        } else if (url.includes("leetcode.com")) {
+            return url.replace("/description/", "/discuss/?currentPage=1&orderBy=most_votes&query=");
+        }
+
+        return "https://leetcode.com/";
+    }
+
+    private getSolutionLink(url: string): string {
+        if (url.includes("leetcode-cn.com") || url.includes("leetcode.com")) {
+            return url.replace("/description/", "/solution/");
+        }
+
+        return "https://leetcode.com/";
+    }
 }
 
 interface IDescription {

From f5c8e7fae50b8324e596f5be4f90070322def044 Mon Sep 17 00:00:00 2001
From: Sheng Chen <sheche@microsoft.com>
Date: Wed, 2 Oct 2019 13:14:47 +0800
Subject: [PATCH 3/4] Fix LGTM warning

---
 src/webview/leetCodePreviewProvider.ts | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/webview/leetCodePreviewProvider.ts b/src/webview/leetCodePreviewProvider.ts
index 0bd3aaa6..4ba99b48 100644
--- a/src/webview/leetCodePreviewProvider.ts
+++ b/src/webview/leetCodePreviewProvider.ts
@@ -2,7 +2,8 @@
 // Licensed under the MIT license.
 
 import { commands, ViewColumn } from "vscode";
-import { IProblem } from "../shared";
+import { getLeetCodeEndpoint } from "../commands/plugin";
+import { Endpoint, IProblem } from "../shared";
 import { ILeetCodeWebviewOption, LeetCodeWebview } from "./LeetCodeWebview";
 import { markdownEngine } from "./markdownEngine";
 
@@ -180,9 +181,10 @@ class LeetCodePreviewProvider extends LeetCodeWebview {
     }
 
     private getDiscussionLink(url: string): string {
-        if (url.includes("leetcode-cn.com")) {
+        const endPoint: string = getLeetCodeEndpoint();
+        if (endPoint === Endpoint.LeetCodeCN) {
             return url.replace("/description/", "/comments/");
-        } else if (url.includes("leetcode.com")) {
+        } else if (endPoint === Endpoint.LeetCode) {
             return url.replace("/description/", "/discuss/?currentPage=1&orderBy=most_votes&query=");
         }
 
@@ -190,11 +192,7 @@ class LeetCodePreviewProvider extends LeetCodeWebview {
     }
 
     private getSolutionLink(url: string): string {
-        if (url.includes("leetcode-cn.com") || url.includes("leetcode.com")) {
-            return url.replace("/description/", "/solution/");
-        }
-
-        return "https://leetcode.com/";
+        return url.replace("/description/", "/solution/");
     }
 }
 

From 80ddfb74e26a52c981b25d812eb38539b534fdc4 Mon Sep 17 00:00:00 2001
From: Sheng Chen <sheche@microsoft.com>
Date: Wed, 2 Oct 2019 13:25:44 +0800
Subject: [PATCH 4/4] Refine the style

---
 src/webview/leetCodePreviewProvider.ts | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/webview/leetCodePreviewProvider.ts b/src/webview/leetCodePreviewProvider.ts
index 4ba99b48..fba17728 100644
--- a/src/webview/leetCodePreviewProvider.ts
+++ b/src/webview/leetCodePreviewProvider.ts
@@ -98,11 +98,7 @@ class LeetCodePreviewProvider extends LeetCodeWebview {
             ),
             `</details>`,
         ].join("\n");
-        const links: string = markdownEngine.render([
-            `---`,
-            `- [Discussion](${this.getDiscussionLink(url)})`,
-            `- [Solution](${this.getSolutionLink(url)})`,
-        ].join("\n"));
+        const links: string = markdownEngine.render(`[Discussion](${this.getDiscussionLink(url)}) | [Solution](${this.getSolutionLink(url)})`);
         return `
             <!DOCTYPE html>
             <html>
@@ -120,6 +116,7 @@ class LeetCodePreviewProvider extends LeetCodeWebview {
                 ${tags}
                 ${companies}
                 ${body}
+                <hr />
                 ${links}
                 ${!this.sideMode ? button.element : ""}
                 <script>