fix/ #48 cwd fix for relative file references in arguments (#50)

* fix/ #48 cwd fix for relative file references in arguments

* restore out commented lines

Author: davidramnero

src/extension.ts

@@ -4,7 +4,7 @@ import * as path from "path";
 import * as xml2js from 'xml2js';
 
 import { runCommand } from './util/scripts';
-import { resolvePath } from './util/path';
+import { resolvePath, findWorkspaceRoot } from './util/path';
 
 enum SeverityNumber {
     Info = 0,
@@ -219,8 +219,10 @@ async function runCppcheckOnFileXML(
             ...argsParsed,
             filePath,
         ].filter(Boolean);
+
+        const cwd = findWorkspaceRoot();
         proc = cp.spawn(commandPath, args, {
-            cwd: path.dirname(document.fileName),
+            cwd,
         });
     }
 

src/util/path.ts

@@ -2,11 +2,16 @@ import * as path from "path";
 import * as os from "os";
 import * as vscode from 'vscode';
 
-export function resolvePath(argPath: string): string {
+export function findWorkspaceRoot(): string {
     const folders = vscode.workspace.workspaceFolders;
     const workspaceRoot = folders && folders.length > 0
         ? folders[0].uri.fsPath
         : process.cwd();
+    return workspaceRoot;
+}
+
+export function resolvePath(argPath: string): string {
+    const workspaceRoot = findWorkspaceRoot();
 
     // Expand ${workspaceFolder}
     if (argPath.includes("${workspaceFolder}")) {