created issue specific solution before full compilerFragments enhance…

…ment
microsoft · Dec 9, 2024 · cf80743 · cf80743
1 parent a123cce
commit cf80743
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/assets/parseCompilerArgs.sh b/assets/parseCompilerArgs.sh
diff --git a/src/parser.ts b/src/parser.ts
@@ -1213,18 +1213,24 @@ export async function parseCustomConfigProvider(
         // and switches that don't affect IntelliSense but are causing errors.
         let compilerArgs: string[] = [];
         let compilerFragments: string[] = [];
+
         if (useCompilerFragments) {
-          compilerFragments = await parseAnySwitchFromToolArguments(
-            compilerTool.arguments,
-            ["I", "FI", "include", "D", "std", "MF"]
-          );
-        } else {
-          compilerArgs = await parseAnySwitchFromToolArguments(
-            compilerTool.arguments,
-            ["I", "FI", "include", "D", "std", "MF"]
-          );
+          // This is a temporary solution where we are only using compiler fragments here to pass the 
+          // -D defines to the compiler (to fix intellisense issues). We still separately parse defines.
+          // There is still an issue tracking using compilerFragments fully instead of compilerArgs: 
+          // https://github.com/microsoft/vscode-makefile-tools/issues/352.
+          let tempFragments: string[] = compilerTool.arguments.trim().split(" -D");
+          if (tempFragments.length > 1) {
+            for (let i: number = 1; i < tempFragments.length; i++) {
+              compilerFragments.push("-D" + tempFragments[i].trim().split("/\s+/")[0]);
+            }
+          }
         }
 
+        compilerArgs = await parseAnySwitchFromToolArguments(
+          compilerTool.arguments,
+          ["I", "FI", "include", "D", "std", "MF"]
+        );
 
         // Parse and log the includes, forced includes and the defines
         let includes: string[] = parseMultipleSwitchFromToolArguments(