fix: add code file support

Author: convexwf

.vscode/launch.json

@@ -2,27 +2,51 @@
 {
     "version": "0.1.0",
     "configurations": [
+        {
+            "name": "Run Extension",
+            "type": "extensionHost",
+            "request": "launch",
+            "runtimeExecutable": "${execPath}",
+            "args": [
+                "D:/tmp/leetcode-test",
+                "--disable-extensions",
+                "--extensionDevelopmentPath=${workspaceFolder}"
+            ],
+            "outFiles": [
+                "${workspaceFolder}/out/**/*.js"
+            ],
+            "preLaunchTask": "${defaultBuildTask}"
+        },
         {
             "name": "Launch Extension",
             "type": "extensionHost",
             "request": "launch",
             "runtimeExecutable": "${execPath}",
-            "args": ["--extensionDevelopmentPath=${workspaceRoot}" ],
+            "args": [
+                "--extensionDevelopmentPath=${workspaceRoot}"
+            ],
             "stopOnEntry": false,
             "sourceMaps": true,
-            "outFiles": [ "${workspaceRoot}/out/src/**/*.js" ],
+            "outFiles": [
+                "${workspaceRoot}/out/src/**/*.js"
+            ],
             "preLaunchTask": "npm"
         },
         {
             "name": "Launch Tests",
             "type": "extensionHost",
             "request": "launch",
             "runtimeExecutable": "${execPath}",
-            "args": ["--extensionDevelopmentPath=${workspaceRoot}", "--extensionTestsPath=${workspaceRoot}/out/test" ],
+            "args": [
+                "--extensionDevelopmentPath=${workspaceRoot}",
+                "--extensionTestsPath=${workspaceRoot}/out/test"
+            ],
             "stopOnEntry": false,
             "sourceMaps": true,
-            "outFiles": [ "${workspaceRoot}/out/test/**/*.js" ],
+            "outFiles": [
+                "${workspaceRoot}/out/test/**/*.js"
+            ],
             "preLaunchTask": "npm"
         }
     ]
-}
+}

package-lock.json

@@ -2,7 +2,7 @@
   "name": "vscode-leetcode",
   "displayName": "LeetCode",
   "description": "Solve LeetCode problems in VS Code",
-  "version": "0.19.0",
+  "version": "0.19.1",
   "author": "convexwf",
   "publisher": "LeetCode",
   "license": "MIT",

package.json

@@ -13,7 +13,7 @@ import { leetCodeManager } from "../leetCodeManager";
 import { IProblem, IQuickItemEx, languages, ProblemState } from "../shared";
 import { genFileExt, genFileName, getNodeIdFromFile } from "../utils/problemUtils";
 import * as settingUtils from "../utils/settingUtils";
-import { IDescriptionConfiguration } from "../utils/settingUtils";
+import { IDescriptionConfiguration, getWorkspaceConfiguration } from "../utils/settingUtils";
 import { DialogOptions, DialogType, openSettingsEditor, promptForOpenOutputChannel, promptForSignIn, promptHintMessage } from "../utils/uiUtils";
 import { getActiveFilePath, selectWorkspaceFolder } from "../utils/workspaceUtils";
 import * as wsl from "../utils/wslUtils";
@@ -65,7 +65,7 @@ export async function showDocumentation(node?: LeetCodeNode): Promise<void> {
     }
     console.log(`Show documentation: ${node.id}`);
     try {
-        const leetCodeConfig: vscode.WorkspaceConfiguration = vscode.workspace.getConfiguration("leetcode");
+        const leetCodeConfig: vscode.WorkspaceConfiguration = getWorkspaceConfiguration();
         const workspaceFolder: string = await selectWorkspaceFolder();
         if (!workspaceFolder) {
             return;

src/commands/show.ts

@@ -160,7 +160,7 @@ class LeetCodeExecutor implements Disposable {
         const description = this.parseDescription(descString, problemNode);
         const { title, url, category, difficulty, likes, dislikes, body } = description;
 
-        const head: string = `# [${problemNode.id}. ${title}](${url})`;
+        const head: string = `# [${problemNode.id}.${title}](${url})`;
         const info: string = [
             `| Category | Difficulty | Likes | Dislikes |`,
             `| :------: | :--------: | :---: | :------: |`,
@@ -180,7 +180,7 @@ class LeetCodeExecutor implements Disposable {
             '',
             info,
             '',
-            body.replace(/\t/g, "  "),
+            body.replace(/\t/g, "  ").replace(/(\n)+/g, "\n"),
             "## Solution\n",
             "**题目描述**\n",
             "**解题思路**\n",
@@ -261,8 +261,8 @@ class LeetCodeExecutor implements Disposable {
 
     public async submitSolution(filePath: string): Promise<string> {
         try {
-            return promiseWithTimeout(this.executeCommandWithProgressEx("Submitting to LeetCode...", this.nodeExecutable, [await this.getLeetCodeBinaryPath(), "submit", `"${filePath}"`]), 10000);
-            // return await this.executeCommandWithProgressEx("Submitting to LeetCode...", this.nodeExecutable, [await this.getLeetCodeBinaryPath(), "submit", `"${filePath}"`]);
+            // return promiseWithTimeout(this.executeCommandWithProgressEx("Submitting to LeetCode...", this.nodeExecutable, [await this.getLeetCodeBinaryPath(), "submit", `"${filePath}"`]), 10000);
+            return await this.executeCommandWithProgressEx("Submitting to LeetCode...", this.nodeExecutable, [await this.getLeetCodeBinaryPath(), "submit", `"${filePath}"`]);
         } catch (error) {
             if (error.result) {
                 return error.result;
@@ -273,8 +273,8 @@ class LeetCodeExecutor implements Disposable {
 
     public async testSolution(filePath: string, testString?: string): Promise<string> {
         if (testString) {
-            return promiseWithTimeout(this.executeCommandWithProgressEx("Submitting to LeetCode...", this.nodeExecutable, [await this.getLeetCodeBinaryPath(), "test", `"${filePath}"`, "-t", `${testString}`]), 10000);
-            // return await this.executeCommandWithProgressEx("Submitting to LeetCode...", this.nodeExecutable, [await this.getLeetCodeBinaryPath(), "test", `"${filePath}"`, "-t", `${testString}`]);
+            // return promiseWithTimeout(this.executeCommandWithProgressEx("Submitting to LeetCode...", this.nodeExecutable, [await this.getLeetCodeBinaryPath(), "test", `"${filePath}"`, "-t", `${testString}`]), 10000);
+            return await this.executeCommandWithProgressEx("Submitting to LeetCode...", this.nodeExecutable, [await this.getLeetCodeBinaryPath(), "test", `"${filePath}"`, "-t", `${testString}`]);
         }
         return promiseWithTimeout(this.executeCommandWithProgressEx("Submitting to LeetCode...", this.nodeExecutable, [await this.getLeetCodeBinaryPath(), "test", `"${filePath}"`]), 10000);
         // return await this.executeCommandWithProgressEx("Submitting to LeetCode...", this.nodeExecutable, [await this.getLeetCodeBinaryPath(), "test", `"${filePath}"`]);

src/leetCodeExecutor.ts

@@ -5,7 +5,16 @@ import { workspace, WorkspaceConfiguration } from "vscode";
 import { DescriptionConfiguration } from "../shared";
 
 export function getWorkspaceConfiguration(): WorkspaceConfiguration {
+    // if (!window.activeTextEditor) {
+    //     return workspace.getConfiguration("leetcode");
+    // }
     return workspace.getConfiguration("leetcode");
+    // let uri = window.activeTextEditor.document.uri;
+    // let workspaceFolder = workspace.getWorkspaceFolder(uri);
+    // console.log("workspaceFolder", workspaceFolder ? workspaceFolder.uri.fsPath : "");
+    // let config = workspace.getConfiguration('leetcode', workspaceFolder);
+    // console.log("getWorkspaceConfiguration", config.get("workspaceFolder"));
+    // return config;
 }
 
 export function shouldHideSolvedProblem(): boolean {

src/utils/settingUtils.ts

@@ -104,6 +104,9 @@ export async function copyCodeBlock(): Promise<string | undefined> {
         vscode.window.showErrorMessage('当前没有打开的文本编辑器');
         return;
     }
+    // 获取当前文件的后缀名
+    const activeFilePath = editor.document.uri.fsPath;
+    const activeileExt = activeFilePath.split('.').pop();
     // 获取当前光标所在行
     const currentLine = editor.selection.active.line;
 
@@ -127,12 +130,14 @@ export async function copyCodeBlock(): Promise<string | undefined> {
         endLine++;
     }
 
-    const leetCodeConfig: vscode.WorkspaceConfiguration = vscode.workspace.getConfiguration("leetcode");
-    const filePath: string = leetCodeConfig.get<string>(`filePath.default.codefile`, "").trim();
+    const workspaceFolder = getWorkspaceFolder();
+    let filePath: string = path.join(workspaceFolder, "temp", `temp.${activeileExt}`);
+    console.log("filePath", filePath);
     if (filePath === "") {
-        vscode.window.showErrorMessage("Please specify the default code file path in the settings.");
+        vscode.window.showErrorMessage('请先设置 LeetCode 插件的工作目录');
         return;
     }
+    filePath = wsl.useWsl() ? await wsl.toWinPath(filePath) : filePath;
 
     // 如果找到了符合条件的区域，将其复制到文件中
     if (startLine < endLine) {
@@ -141,6 +146,8 @@ export async function copyCodeBlock(): Promise<string | undefined> {
                 new vscode.Position(startLine, 0),
                 new vscode.Position(endLine + 1, 0)
             ));
+        // create dir if not exists
+        fse.ensureDirSync(path.dirname(filePath));
         fse.writeFileSync(filePath, fileContent);
 
         // vscode.window.showInformationMessage(`成功将代码复制到文件 ${filePath}`);