From bf519c8babc7a7f8c4271024d01fd1ce81765522 Mon Sep 17 00:00:00 2001 From: WebFreak001 Date: Sun, 4 Sep 2016 17:11:20 +0200 Subject: [PATCH] Fixed cygdrive paths in stack request (fix #72) --- src/mibase.ts | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/mibase.ts b/src/mibase.ts index 4b5fc3b..e354343 100644 --- a/src/mibase.ts +++ b/src/mibase.ts @@ -209,6 +209,11 @@ export class MI2DebugSession extends DebugSession { file = relative(this.switchCWD.replace(/\\/g, "/"), file.replace(/\\/g, "/")); file = systemPath.resolve(this.trimCWD.replace(/\\/g, "/"), file.replace(/\\/g, "/")); } + else if (process.platform === "win32") { + if (file.startsWith("\\cygdrive\\") || file.startsWith("/cygdrive/")) { + file = file[10] + ":" + file.substr(11); // replaces /cygdrive/c/foo/bar.txt with c:/foo/bar.txt + } + } ret.push(new StackFrame(element.level, element.function + "@" + element.address, new Source(element.fileName, file), element.line, 0)); }); response.body = { @@ -340,15 +345,13 @@ export class MI2DebugSession extends DebugSession { } else { if (typeof expanded == "string") { - if (expanded == "") - { + if (expanded == "") { if (argsPart) argsPart = false; else return submit(); } - else if (expanded[0] != '"') - { + else if (expanded[0] != '"') { strArr.push({ name: "[err]", value: expanded,