Skip to content

feat: implement longest prefix matching for pathMappings (closes #331) #363

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

Merged
zobo merged 2 commits into from
Feb 6, 2021
Merged

feat: implement longest prefix matching for pathMappings (closes #331) #363

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
9e7e54b
feat: implement longest prefix matching for pathMappings (closes #331)
bjoluc Jun 14, 2019
a158c39
test: add test cases for server path longest prefix matching
bjoluc Feb 5, 2021
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
20 changes: 14 additions & 6 deletions src/paths.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,13 @@ export function convertDebuggerPathToClient(
// normalize slashes for windows-to-unix
const serverRelative = (serverIsWindows ? path.win32 : path.posix).relative(mappedServerPath, serverPath)
if (serverRelative.indexOf('..') !== 0) {
serverSourceRoot = mappedServerPath
localSourceRoot = mappedLocalSource
break
// If a matching mapping has previously been found, only update
// it if the current server path is longer than the previous one
// (longest prefix matching)
if (!serverSourceRoot || mappedServerPath.length > serverSourceRoot.length) {
serverSourceRoot = mappedServerPath
localSourceRoot = mappedLocalSource
}
}
}
}
Expand Down Expand Up @@ -82,9 +86,13 @@ export function convertClientPathToDebugger(localPath: string, pathMapping?: { [
const mappedLocalSource = pathMapping[mappedServerPath]
const localRelative = path.relative(mappedLocalSource, localPath)
if (localRelative.indexOf('..') !== 0) {
serverSourceRoot = mappedServerPath
localSourceRoot = mappedLocalSource
break
// If a matching mapping has previously been found, only update
// it if the current local path is longer than the previous one
// (longest prefix matching)
if (!localSourceRoot || mappedLocalSource.length > localSourceRoot.length) {
serverSourceRoot = mappedServerPath
localSourceRoot = mappedLocalSource
}
}
}
}
Expand Down
18 changes: 18 additions & 0 deletions src/test/paths.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,15 @@ describe('paths', () => {
}),
'file:///app/source.php'
)
// longest prefix matching for server paths
assert.strictEqual(
convertClientPathToDebugger('/home/felix/mysource/subdir/source.php', {
'/var/www': '/home/felix/mysite',
'/app/subdir1': '/home/felix/mysource/subdir',
Comment thread
bjoluc marked this conversation as resolved.
'/app': '/home/felix/mysource',
}),
'file:///app/subdir1/source.php'
)
})
// unix to windows
it('should convert a unix path to a windows URI', () => {
Expand Down Expand Up @@ -165,6 +174,15 @@ describe('paths', () => {
}),
'/home/felix/mysource/source.php'
)
// longest prefix matching for local paths
assert.strictEqual(
convertDebuggerPathToClient('file:///app/subdir/source.php', {
'/var/www': '/home/felix/mysite',
'/app/subdir': '/home/felix/mysource/subdir1',
Comment thread
bjoluc marked this conversation as resolved.
'/app': '/home/felix/mysource',
}),
'/home/felix/mysource/subdir1/source.php'
)
})
// unix to windows
;(process.platform === 'win32' ? it : it.skip)('should map unix uris to windows paths', () => {
Expand Down