Skip to content

Commit 9cfdbdd

Browse files
authored
Support embedded debugging experience in environments with nested Dart app ID (#1525)
1 parent 40a7c9d commit 9cfdbdd

File tree

8 files changed

+354
-328
lines changed

8 files changed

+354
-328
lines changed

dwds/debug_extension/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 1.26
2+
3+
- Support embedded debugging experience in environments with no Dart app ID.
4+
15
## 1.25
26

37
- Embed Dart DevTools in Chrome DevTools.

dwds/debug_extension/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: extension
22
publish_to: none
3-
version: 1.25.0
3+
version: 1.26.0
44
author: Dart Team <[email protected]>
55
homepage: https://github.com/dart-lang/webdev
66
description: >-

dwds/debug_extension/web/background.dart

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -225,21 +225,21 @@ void _handleMessageFromContentScripts(
225225
_maybeMarkTabAsDebuggable(request, sender, sendResponse);
226226
break;
227227
case 'panel-script':
228-
_handleDevToolsOpen(request, sender);
228+
_handleMessageFromPanelScript(request, sender);
229229
break;
230230
}
231231
}
232232

233-
void _handleDevToolsOpen(Request request, Sender sender) {
234-
if (request.message == 'devtools-open') {
235-
_updateOrCreateDevToolsPanel(request.dartAppId, (panel) {
236-
panel.panelId = sender.id;
237-
});
238-
return;
239-
}
240-
241-
if (request.message == 'start-debugging') {
242-
_startDebugging(DebuggerTrigger.dartPanel);
233+
void _handleMessageFromPanelScript(Request request, Sender sender) {
234+
switch (request.message) {
235+
case 'devtools-open':
236+
_updateOrCreateDevToolsPanel(request.dartAppId, (panel) {
237+
panel.panelId = sender.id;
238+
});
239+
break;
240+
case 'start-debugging':
241+
_startDebugging(DebuggerTrigger.dartPanel);
242+
break;
243243
}
244244
}
245245

0 commit comments

Comments
 (0)