Skip to content

fix: convertDebuggerPathToClient #365

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

Closed
robberphex wants to merge 2 commits into from
Closed

fix: convertDebuggerPathToClient #365

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
da35648
fix: convertDebuggerPathToClient
robberphex Jun 22, 2019
a30addb
fix: when level>2, repalce all
robberphex Jun 24, 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
5 changes: 4 additions & 1 deletion src/paths.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,13 @@ export function convertDebuggerPathToClient(
let localPath: string
if (serverSourceRoot && localSourceRoot) {
// get the part of the path that is relative to the source root
const pathRelativeToSourceRoot = (serverIsWindows ? path.win32 : path.posix).relative(
let pathRelativeToSourceRoot = (serverIsWindows ? path.win32 : path.posix).relative(
Comment thread
robberphex marked this conversation as resolved.
serverSourceRoot,
serverPath
)
if (serverIsWindows) {
pathRelativeToSourceRoot = pathRelativeToSourceRoot.replace(/\\/g, path.sep)
}
// resolve from the local source root
localPath = path.resolve(localSourceRoot, pathRelativeToSourceRoot)
} else {
Expand Down
8 changes: 8 additions & 0 deletions src/test/paths.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,14 @@ describe('paths', () => {
}),
'/home/felix/mysource/source.php'
)
// multi level source
assert.equal(
convertDebuggerPathToClient('file:///C:/Program%20Files/MySource/src/app/source.php', {
'C:\\Program Files\\Apache\\2.4\\htdocs': '/home/felix/mysite',
'C:\\Program Files\\MySource': '/home/felix/mysource',
}),
'/home/felix/mysource/src/app/source.php'
)
})
// windows to windows
;(process.platform === 'win32' ? it : it.skip)('should map windows uris to windows paths', () => {
Expand Down