-
Notifications
You must be signed in to change notification settings - Fork 13
AST-based breakpoint validation #317
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.
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
chrisdp
wants to merge
8
commits into
master
Choose a base branch
from
feature/smarter-breakpoint-location-setting
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+700
−34
Open
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
1a03a78
first pass at failing known bad breakpoints based on files contents o…
chrisdp 875a31d
some fixes for BP's being alowed on end style statments
chrisdp a708de1
split the logic up a bit so things are more clear and we don't do tel…
chrisdp 47b72d5
Rewrite isStagingLineExecutable with blacklist approach and structure…
chrisdp 118f393
Refine breakpoint validity rules for BrightScript
chrisdp eb974ff
Revert BrightScriptDebugSession test workaround
chrisdp 8c6d777
Rename isStagingLineExecutable to isValidBreakpointLine and update la…
chrisdp c555357
Merge branch 'master' into feature/smarter-breakpoint-location-setting
chrisdp File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1200,10 +1200,10 @@ export class BrightScriptDebugSession extends LoggingDebugSession { | |
| //add breakpoint lines to source files and then publish | ||
| util.log('Adding stop statements for active breakpoints'); | ||
|
|
||
| //write the `stop` statements to every file that has breakpoints (do for telnet, skip for debug protocol) | ||
| if (!this.enableDebugProtocol) { | ||
|
|
||
| await this.breakpointManager.writeBreakpointsForProject(this.projectManager.mainProject); | ||
| if (this.enableDebugProtocol) { | ||
| await this.breakpointManager.resolveBreakpointsForProject(this.projectManager.mainProject); | ||
| } else { | ||
| await this.breakpointManager.injectBreakpointsForProject(this.projectManager.mainProject); | ||
|
Comment on lines
+1204
to
+1206
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Can we move this branching logic inside of a single call? Would prefer avoiding branchout out here if possible. |
||
| } | ||
|
|
||
| if (this.launchConfiguration.packageTask) { | ||
|
|
@@ -1308,9 +1308,10 @@ export class BrightScriptDebugSession extends LoggingDebugSession { | |
| // Add breakpoint lines to the staging files and before publishing | ||
| util.log('Adding stop statements for active breakpoints in Component Libraries'); | ||
|
|
||
| //write the `stop` statements to every file that has breakpoints (do for telnet, skip for debug protocol) | ||
| if (!this.enableDebugProtocol) { | ||
| await this.breakpointManager.writeBreakpointsForProject(compLibProject); | ||
| if (this.enableDebugProtocol) { | ||
| await this.breakpointManager.resolveBreakpointsForProject(compLibProject); | ||
| } else { | ||
| await this.breakpointManager.injectBreakpointsForProject(compLibProject); | ||
| } | ||
|
|
||
| await compLibProject.postfixFiles(); | ||
|
|
||
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let's find different names for these.
"write" still feels good for when it actually is rewriting the code.
"resolve" is the ambiguous one, it feels like it's more like "scan the project and make sure that every breakpoint is allowed to be at this spot, or throw out the ones that aren't allowed or move them". So you know, a good function name for that. ;)