Merge pull request #329 from ccagml/main

3.2.3

Author: ccagml

.vscode/launch.json

@@ -20,6 +20,9 @@
             ],
             "trace": false,
             "preLaunchTask": "npm",
+            "env": {
+                "PATH": "${env:PATH}"
+            }
         },
         {
             "type": "node",

CHANGELOG.md

@@ -1,3 +1,7 @@
+# version 3.2.3
+
+- 添加 msvc 支持，使用 path 中的 clang，gcc 使用 c++20 标准
+
 # version 3.2.2
 
 - 手气一下显示分数范围

package.json

@@ -2,7 +2,7 @@
     "name": "vscode-leetcode-problem-rating",
     "displayName": "LeetCode",
     "description": "%main.description%",
-    "version": "3.2.2",
+    "version": "3.2.3",
     "author": "ccagml",
     "publisher": "ccagml",
     "license": "MIT",
@@ -1196,11 +1196,13 @@
                         "default": "gdb",
                         "enum": [
                             "gdb",
-                            "clang"
+                            "clang",
+                            "msvc"
                         ],
                         "enumDescriptions": [
                             "%main.contributes.configuration.properties.leetcode-problem-rating.cppCompiler.enumDescriptions.0%",
-                            "%main.contributes.configuration.properties.leetcode-problem-rating.cppCompiler.enumDescriptions.1%"
+                            "%main.contributes.configuration.properties.leetcode-problem-rating.cppCompiler.enumDescriptions.1%",
+                            "%main.contributes.configuration.properties.leetcode-problem-rating.cppCompiler.enumDescriptions.2%"
                         ],
                         "scope": "resource"
                     }

package.nls.json

@@ -104,7 +104,8 @@
     "main.contributes.configuration.properties.leetcode-problem-rating.openClearProblemCacheTime.description": "Open the app to clear the cache interval by default 3600 seconds",
     "main.contributes.configuration.properties.leetcode-problem-rating.cppCompiler.enumDescriptions": [
         "gdb compiler",
-        "clang compiler"
+        "clang compiler",
+        "msvc compiler"
     ],
     "main.contributes.configuration.properties.leetcode-problem-rating.problems.sortStrategy.enumDescriptions.0": "None",
     "main.contributes.configuration.properties.leetcode-problem-rating.problems.sortStrategy.enumDescriptions.1": "Acceptance Rate (Ascending)",
@@ -126,5 +127,6 @@
     "main.contributes.configuration.properties.leetcode-problem-rating.hideScore.enumDescriptions.2": "Hide questions with no scores",
     "main.contributes.configuration.properties.leetcode-problem-rating.hideScore.enumDescriptions.3": "Hide questions outside the range of scores [pickOneByRankRangeMin, pickOneByRankRangeMax]",
     "main.contributes.configuration.properties.leetcode-problem-rating.cppCompiler.enumDescriptions.0": "gdb compiler",
-    "main.contributes.configuration.properties.leetcode-problem-rating.cppCompiler.enumDescriptions.1": "clang compiler"
+    "main.contributes.configuration.properties.leetcode-problem-rating.cppCompiler.enumDescriptions.1": "clang compiler",
+    "main.contributes.configuration.properties.leetcode-problem-rating.cppCompiler.enumDescriptions.2": "msvc compiler"
 }

package.nls.zh-cn.json

@@ -104,7 +104,8 @@
     "main.contributes.configuration.properties.leetcode-problem-rating.openClearProblemCacheTime.description": "打开拓展时清除缓存间隔默认3600秒",
     "main.contributes.configuration.properties.leetcode-problem-rating.cppCompiler.enumDescriptions": [
         "gdb compiler",
-        "clang compiler"
+        "clang compiler",
+        "msvc compiler"
     ],
     "main.contributes.configuration.properties.leetcode-problem-rating.problems.sortStrategy.enumDescriptions.0": "默认题目编号排序",
     "main.contributes.configuration.properties.leetcode-problem-rating.problems.sortStrategy.enumDescriptions.1": "通过率升序",
@@ -126,5 +127,6 @@
     "main.contributes.configuration.properties.leetcode-problem-rating.hideScore.enumDescriptions.2": "隐藏没有分数的题目",
     "main.contributes.configuration.properties.leetcode-problem-rating.hideScore.enumDescriptions.3": "隐藏分数在配置[pickOneByRankRangeMin, pickOneByRankRangeMax]范围外的题目",
     "main.contributes.configuration.properties.leetcode-problem-rating.cppCompiler.enumDescriptions.0": "gdb编译",
-    "main.contributes.configuration.properties.leetcode-problem-rating.cppCompiler.enumDescriptions.1": "clang编译"
+    "main.contributes.configuration.properties.leetcode-problem-rating.cppCompiler.enumDescriptions.1": "clang编译",
+    "main.contributes.configuration.properties.leetcode-problem-rating.cppCompiler.enumDescriptions.2": "msvc编译",
 }

src/debug/DoCpp.ts

@@ -36,9 +36,13 @@ function getGdbDefaultConfig(): IDebugConfig {
 
 function getClangDefaultConfig(): IDebugConfig {
   return {
-    type: "cppdbg",
-    MIMode: "lldb",
-    externalConsole: false,
+    type: "lldb",
+  };
+}
+
+function getMSVCDefaultConfig(): IDebugConfig {
+  return {
+    type: "cppvsdbg",
   };
 }
 
@@ -240,28 +244,44 @@ export class DebugCpp {
 
     const compiler = vscode.workspace.getConfiguration("leetcode-problem-rating").get<string>("cppCompiler") ?? "gdb";
     let debugConfig: any;
-    if (compiler === "clang") {
-      debugConfig = await this.getClangDebugConfig({
-        program,
-        exePath,
-        commonDestPath,
-        jsonPath,
-        thirdPartyPath,
-        filePath,
-        newSourceFilePath,
-      });
-    } else {
-      debugConfig = await this.getGdbDebugConfig({
-        program,
-        exePath,
-        commonDestPath,
-        jsonPath,
-        thirdPartyPath,
-        filePath,
-        newSourceFilePath,
-      });
-    }
-
+      switch (compiler) {
+        case "clang": {
+          debugConfig = await this.getClangDebugConfig({
+            program,
+            exePath,
+            commonDestPath,
+            jsonPath,
+            thirdPartyPath,
+            filePath,
+            newSourceFilePath,
+          });
+          break;
+        }
+        case "gdb": {
+          debugConfig = await this.getGdbDebugConfig({
+            program,
+            exePath,
+            commonDestPath,
+            jsonPath,
+            thirdPartyPath,
+            filePath,
+            newSourceFilePath,
+          });
+          break;
+        }
+        case "msvc": {
+          debugConfig = await this.getMSVCDebugConfig({
+            program,
+            exePath,
+            commonDestPath,
+            jsonPath,
+            thirdPartyPath,
+            filePath,
+            newSourceFilePath,
+          });
+          break;
+        }
+      }
     if (debugConfig == null) {
       return;
     }
@@ -398,7 +418,7 @@ export class DebugCpp {
       const includePath: string = path.dirname(exePath);
       await sysCall(
         "g++",
-        ["-g", program, commonDestPath, jsonPath, "-o", exePath, "-I", includePath, "-I", thirdPartyPath],
+        ["-std=c++20","-g", program, commonDestPath, jsonPath, "-o", exePath, "-I", includePath, "-I", thirdPartyPath],
         { shell: false }
       );
     } catch (e) {
@@ -438,7 +458,7 @@ export class DebugCpp {
     try {
       const includePath: string = path.dirname(exePath);
       await sysCall(
-        "/usr/bin/clang++",
+        "clang++",
         [
           "-std=c++20",
           "-stdlib=libc++",
@@ -470,4 +490,57 @@ export class DebugCpp {
     };
     return debugConfig;
   }
+
+  private async getMSVCDebugConfig({
+    program,
+    exePath,
+    commonDestPath,
+    jsonPath,
+    thirdPartyPath,
+    filePath,
+    newSourceFilePath,
+  }: {
+    program: string;
+    exePath: string;
+    commonDestPath: string;
+    jsonPath: string;
+    thirdPartyPath: string;
+    filePath: string;
+    newSourceFilePath: string;
+  }) {
+    const debugConfig = getMSVCDefaultConfig();
+    try {
+      const includePath: string = path.dirname(exePath);
+      await sysCall(
+        "cl",
+        [
+            "-std:c++20",
+            "-Zi",
+            "-EHsc",
+            program,
+            commonDestPath,
+            jsonPath,
+            `-Fe${exePath}`,
+            "-I",
+            includePath,
+            "-I",
+            thirdPartyPath,
+        ],
+        { shell: false }
+      );
+    } catch (e) {
+      ShowMessage(e, OutPutType.error);
+      BABA.getProxy(BabaStr.LogOutputProxy).get_log().append(e.stack);
+      BABA.getProxy(BabaStr.LogOutputProxy).get_log().show();
+      return;
+    }
+
+    debugConfig.program = exePath;
+    debugConfig.cwd = extensionState.cachePath;
+    // map build source file to user source file
+    debugConfig.sourceFileMap = {
+      [newSourceFilePath]: filePath,
+    };
+    return debugConfig;
+  }
 }