jyapayne/code-debug
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:WebFreak001/code-debug

Browse source
This commit is contained in:
WebFreak001 2016-02-10 13:34:56 +01:00
commit efae57a1eb
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/gdb.ts
View file

@ -5,6 +5,7 @@ import { MINode } from './backend/mi_parse'
import { expandValue, isExpandable } from './backend/gdb_expansion' import { expandValue, isExpandable } from './backend/gdb_expansion'
import { MI2 } from './backend/mi2/mi2' import { MI2 } from './backend/mi2/mi2'
import { posix } from "path" import { posix } from "path"
import * as systemPath from "path"
let resolve = posix.resolve; let resolve = posix.resolve;
let relative = posix.relative; let relative = posix.relative;
@ -197,7 +198,7 @@ class MI2DebugSession extends DebugSession {
let file = element.file; let file = element.file;
if (this.isSSH) { if (this.isSSH) {
file = relative(this.switchCWD.replace(/\\/g, "/"), file.replace(/\\/g, "/")); file = relative(this.switchCWD.replace(/\\/g, "/"), file.replace(/\\/g, "/"));
file = resolve(this.trimCWD.replace(/\\/g, "/"), file.replace(/\\/g, "/")); file = systemPath.resolve(this.trimCWD.replace(/\\/g, "/"), file.replace(/\\/g, "/"));
} }
ret.push(new StackFrame(element.level, element.function + "@" + element.address, new Source(element.fileName, file), element.line, 0)); ret.push(new StackFrame(element.level, element.function + "@" + element.address, new Source(element.fileName, file), element.line, 0));
}); });