Skip to content

fix source path issue for sourceMap #61

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
ialex32x wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix source path issue for sourceMap #61

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
dcfd865
fix source path issue for sourceMap
ialex32x Dec 9, 2019
7def992
remove url shemes in candidatePath before FS.existsSync
ialex32x Dec 9, 2019
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
9 changes: 4 additions & 5 deletions src/DukDebugger.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -528,6 +528,9 @@ export class DukDebugSession extends DebugSession {
this.logToClient(`Protocol ID: ${version.id}\n`);

if (version.major === 2 || (version.major === 1 && version.minor >= 5)) {
if (this._args.sourceMaps) {
this._sourceMaps = new SourceMaps(this._outDir);
}
this.initDukDbgProtocol(conn, buf);
this.finalizeInit(response);
} else {
Expand All @@ -550,10 +553,6 @@ export class DukDebugSession extends DebugSession {
private finalizeInit(response: DebugProtocol.Response): void {
this.dbgLog("Finalized Initialization.");

if (this._args.sourceMaps) {
this._sourceMaps = new SourceMaps(this._outDir);
}

// Make sure that any breakpoints that were left set in
// case of a broken connection are cleared
this.removeAllTargetBreakpoints()
Expand Down Expand Up @@ -2065,7 +2064,7 @@ export class DukDebugSession extends DebugSession {
private unmapSourceFile(path: string): SourceFile {
this.dbgLog(`[unmapSourceFile] Unmapping file: ${path}`);
path = Path.normalize(path);
let name = Path.basename(path);
let name = this.normPath(Path.basename(path));

// Grab the relative path under the source root if this is located there,
// or just keep the full path if it's not
Expand Down
18 changes: 12 additions & 6 deletions src/sourceMaps.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,8 +449,15 @@ export class SourceMap {
* Any url schemes are removed.
*/
private absolutePath(path: string): string {
const prefix = "file://";
if (!util.isAbsolute(path)) {
let candidatePath = util.join(this._sourcemapLocation, path);
if (candidatePath.indexOf(prefix) === 0) {
candidatePath = candidatePath.substr(prefix.length);
if (/^\/[a-zA-Z]\:\//.test(candidatePath)) {
candidatePath = candidatePath.substr(1);
}
}
if (FS.existsSync(candidatePath)) {
path = candidatePath;
} else {
Expand All @@ -463,13 +470,17 @@ export class SourceMap {
}
}
}
const prefix = "file://";
if (path.indexOf(prefix) === 0) {
path = path.substr(prefix.length);
if (/^\/[a-zA-Z]\:\//.test(path)) {
path = path.substr(1);
}
}
// on Windows change forward slashes back to back slashes
if (process.platform === "win32") {
// path = path.replace(/\//g, "\\");
path = path.replace(/\\/g, "/");
}
return path;
}

Expand Down Expand Up @@ -498,11 +509,6 @@ export class SourceMap {

// map result back to absolute path
mp.source = this.absolutePath(mp.source);

// on Windows change forward slashes back to back slashes
if (process.platform === "win32") {
mp.source = mp.source.replace(/\//g, "\\");
}
}

return mp;
Expand Down