Skip to content

Support mingw-make's dryrun output format #738

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vannaka wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Support mingw-make's dryrun output format #738

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9c8f1d1
Add support for single quotes around the tool invocation within the d…
Jun 19, 2025
7f60bd9
Update CHANGELOG.md
Jun 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# What's New?

## 0.13

Improvements:

- Improve dryrun parsing to support single-quoted tool paths. mingw-make now working. [#739](https://github.com/microsoft/vscode-makefile-tools/issues/739)

## 0.12

Improvements:
Expand Down
14 changes: 7 additions & 7 deletions src/parser.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,7 @@ async function parseLineAsTool(
// - with or without extension (windows only)
// - with or without quotes
// - must have at least one space or tab after the tool invocation
let regexpStr: string = '^[\\s\\"]*(.*?)(';
let regexpStr: string = "^[\\s\\\"\\']*(.*?)(";
if (process.platform === "win32") {
regexpStr += versionedToolNames.join("\\.exe|");

Expand All @@ -399,7 +399,7 @@ async function parseLineAsTool(
regexpStr += "|";
}

regexpStr += versionedToolNames.join("|") + ')(\\s|\\"\\s)(.*)$';
regexpStr += versionedToolNames.join("|") + ")(\\s|\\\"\\s|\\'\\s)(.*)$";

let regexp: RegExp = RegExp(regexpStr, "mg");
let match: RegExpExecArray | null = regexp.exec(line);
Expand Down Expand Up @@ -476,11 +476,11 @@ function findNextQuoteIndex(str: string, start: number, quote: string): number {
continue;
}

if (char === '\\') {
if (char === "\\") {
escaping = true;
continue;
}

if (char === quote) {
return index;
}
Expand Down Expand Up @@ -512,9 +512,9 @@ async function parseAnySwitchFromToolArguments(
// On Win32 allow '/' as switch prefix as well,
// otherwise it conflicts with path character
(process.platform === "win32" ? "|\\/)" : ")") +
"([a-zA-Z0-9_]+)" +
"([a-zA-Z0-9_]+)" +
// Try to match quoted value of argument
"(=(\"|\'))?";
"(=(\"|'))?";
let regexp: RegExp = RegExp(regExpStr, "mg");
let match1: RegExpExecArray | null;
let match2: RegExpExecArray | null;
Expand Down Expand Up @@ -572,7 +572,7 @@ async function parseAnySwitchFromToolArguments(
partialArgs = args.substring(index1, index2);
swi = match1[3];
swi = swi.trim();

// Skip over any switches that we know we don't need
let exclude: boolean = false;
for (const arg of excludeArgs) {
Expand Down