Fix replacing ${workspaceFolder} in analyze args

Ericsson · Feb 2, 2022 · b8ab95a · b8ab95a
1 parent bf5299e
commit b8ab95a
Showing 1 changed file with 14 additions and 1 deletion.
diff --git a/src/backend/executor/bridge.ts b/src/backend/executor/bridge.ts
@@ -120,7 +120,20 @@ export class ExecutorBridge implements Disposable {
             ?? path.join(workspaceFolder, '.codechecker');
 
         const ccArgumentsSetting = workspace.getConfiguration('codechecker.executor').get<string>('arguments');
-        const ccArguments = parse(ccArgumentsSetting ?? '')
+
+        // TODO: Merge this collection with replaceVariables
+        const env: { [key: string]: string } = {
+            workspaceFolder,
+            workspaceRoot: workspaceFolder,
+            cwd: process.cwd()
+        };
+        for (const [key, val] of Object.entries(process.env)) {
+            if (val !== undefined) {
+                env[`env.${key}`] = val;
+            }
+        }
+
+        const ccArguments = parse(ccArgumentsSetting ?? '', env)
             .filter((entry) => typeof entry === 'string' && entry.length > 0)
             .map((entry) => replaceVariables(entry as string)!);