Skip to content
This repository was archived by the owner on Jan 11, 2023. It is now read-only.

Distinguish between condition and log value in breakpoints - #7749

Merged
jasonLaster merged 2 commits into
firefox-devtools:masterfrom
bhackett1024:breakpoint-options
Jan 21, 2019
Merged

Distinguish between condition and log value in breakpoints#7749
jasonLaster merged 2 commits into
firefox-devtools:masterfrom
bhackett1024:breakpoint-options

Conversation

@bhackett1024

Copy link
Copy Markdown
Contributor

Summary of Changes

  • Separately track breakpoint conditions and log values, storing them in a BreakpointOptions object.
  • The options are converted into a single condition string before passing onto the source client / breakpoint client. Bug 1520972 will take care of remaining changes to push this down into the server.

const sourceThreadClient = sourceThreads[bpClient.source.actor];
return bpClient
.setCondition(sourceThreadClient, condition, noSliding)
.setCondition(sourceThreadClient, transformOptionsToCondition(options))

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should we keep the noSliding argument?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I removed this because BreakpointClient.prototype.setCondition doesn't actually take a third noSliding argument. It also ignores the thread client argument, which is tidied up by the patch in bug 1520972.

@jasonLaster
jasonLaster merged commit f826ebc into firefox-devtools:master Jan 21, 2019
@bhackett1024
bhackett1024 deleted the breakpoint-options branch January 22, 2019 00:20
jasonLaster pushed a commit that referenced this pull request Jan 23, 2019
* Distinguish between condition and log value in breakpoints, consolidate into a BreakpointOptions object.

* Fix some test failures.
jasonLaster pushed a commit that referenced this pull request Jan 28, 2019
* Distinguish between condition and log value in breakpoints, consolidate into a BreakpointOptions object.

* Fix some test failures.
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants