fix(breakpoints): Breakpoints could get overwritten when multiple TS files map to a single JS file. #285
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…files map to a single JS file.
frgarc
approved these changes
Jan 28, 2025
src/session.ts
Outdated
| for (let originalBreakpoint of originalBreakpoints) { | ||
| const generatedPosition = await this._sourceMaps.getGeneratedPositionFor({ | ||
| source: originalLocalAbsolutePath, | ||
| column: originalBreakpoint.column || 0, |
There was a problem hiding this comment.
Using null coalescing operator should be better:
Suggested change
| column: originalBreakpoint.column || 0, | |
| column: originalBreakpoint.column ?? 0, |
There was a problem hiding this comment.
Thanks for the tip. Looks like I have this in a LOT of places.
src/session.ts
Outdated
| line: originalBreakpoint.line, | ||
| }); | ||
| generatedBreakpoints.push({ | ||
| line: generatedPosition.line || 0, |
There was a problem hiding this comment.
Same here
Suggested change
| line: generatedPosition.line || 0, | |
| line: generatedPosition.line ?? 0, |
rlandav
reviewed
Jan 28, 2025
| @@ -131,6 +131,7 @@ export class Session extends DebugSession { | |||
| private _sourceFileWatcher?: FileSystemWatcher; | |||
| private _activeThreadId: number = 0; // the one being debugged | |||
| private _localRoot: string = ''; | |||
| private _sourceBreakpointsMap: Map<string, DebugProtocol.SourceBreakpoint[] | undefined> = new Map(); | |||
There was a problem hiding this comment.
Might be simpler in usage if the value is just DebugProtocol.SourceBreakpoint[] without the undefined. Just each time you set it, like on line 353, do this._sourceBreakpointsMap.set(args.source.path, args.breakpoints ?? []); to handle the undefined input case.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Maintain a map of source breakpoints per file. VSCode's
setBreakpointRequestis triggered per file whenever breakpoints are added or removed. Since it does not provide all breakpoints for all files, we need to maintain our own record of every breakpoint for every file. This way, we have all inputs available when constructing the complete list of BPs for a given generated file.