Indicate whether an app is a Flutter app via the app ID (#2406)

dart-lang · Apr 16, 2024 · cfd5a6b · cfd5a6b
1 parent 7d0d2d4
commit cfd5a6b
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 3 deletions.
diff --git a/dwds/debug_extension_mv3/pubspec.yaml b/dwds/debug_extension_mv3/pubspec.yaml
@@ -1,6 +1,6 @@
 name: mv3_extension
 publish_to: none
-version: 2.1.2
+version: 2.1.3
 homepage: https://github.com/dart-lang/webdev
 description: >-
   A Chrome extension for Dart debugging.

diff --git a/dwds/debug_extension_mv3/web/cider_connection.dart b/dwds/debug_extension_mv3/web/cider_connection.dart
@@ -205,6 +205,10 @@ Future<void> _sendInspectorUrl({String? appId}) async {
 }
 
 int _tabId(String appId) {
+  // The suffix "-f" is used to tell Cider that this is a Flutter app.
+  if (appId.endsWith('-f')) {
+    appId = appId.substring(0, appId.length - 2);
+  }
   final tabId = appId.split('-').last;
   return int.parse(tabId);
 }

diff --git a/dwds/debug_extension_mv3/web/manifest_mv3.json b/dwds/debug_extension_mv3/web/manifest_mv3.json
@@ -1,6 +1,6 @@
 {
   "name": "Dart Debug Extension",
-  "version": "2.1.2",
+  "version": "2.1.3",
   "manifest_version": 3,
   "devtools_page": "static_assets/devtools.html",
   "action": {

diff --git a/dwds/debug_extension_mv3/web/popup.dart b/dwds/debug_extension_mv3/web/popup.dart
@@ -90,9 +90,11 @@ Future<bool> _insertAppId() async {
   final debugInfo = await _fetchDebugInfo(tabId);
   if (debugInfo == null) return false;
   final isInternalBuild = debugInfo.isInternalBuild ?? false;
+  final isFlutterApp = debugInfo.isFlutterApp ?? false;
   final workspaceName = debugInfo.workspaceName;
   if (isInternalBuild && workspaceName != null) {
-    _appId = '$workspaceName-$tabId';
+    // The suffix "-f" is used to tell Cider that this is a Flutter app.
+    _appId = '$workspaceName-$tabId${isFlutterApp ? '-f' : ''}';
     final appIdSpan = document.getElementById(_appIdSpanId) as SpanElement;
     appIdSpan.setInnerHtml(_appId);
     return true;

diff --git a/dwds/lib/src/services/chrome_proxy_service.dart b/dwds/lib/src/services/chrome_proxy_service.dart
@@ -515,6 +515,7 @@ ${globalToolConfiguration.loadStrategy.loadModuleSnippet}("dart_sdk").developer.
       throw RPCError(
         method,
         decodedResponse['code'] as int,
+        // ignore: avoid-unnecessary-type-casts
         decodedResponse['message'] as String,
         decodedResponse['data'] as Map,
       );