Merge branch 'master' of github.com:flutter/devtools into dcm-test

Author: kenzieschmoll

analysis_options.yaml

@@ -170,10 +170,10 @@ dart_code_metrics:
       # devtools_app/.
       # TODO(https://github.com/flutter/devtools/issues/9906) remove these
       # excludes as findings are resolved.
-      - integration_test/**
-      # Investigate internal usages of inspector_controller before removing.
+      # Investigate internal usages of inspector logic before removing.
       - lib/src/screens/inspector/**_controller.dart
-      - lib/src/shared/**
+      - lib/src/shared/diagnostics/inspector_service.dart
+      - lib/src/shared/diagnostics/diagnostics_node.dart
       # This fixture has unused code for testing the debugger.
       - test/test_infra/fixtures/flutter_app/**
   rules:

packages/devtools_app/assets/dart_syntax.json

@@ -1,6 +1,6 @@
 {
 	"name": "Dart",
-	"version": "1.4.1",
+	"version": "1.5.0",
 	"fileTypes": [
 		"dart"
 	],
@@ -60,6 +60,12 @@
 		{
 			"include": "#constants-and-special-vars"
 		},
+		{
+			"include": "#class-identifier-with-optional-factory-method"
+		},
+		{
+			"include": "#function-identifier"
+		},
 		{
 			"include": "#operators"
 		},
@@ -227,14 +233,50 @@
 				{
 					"name": "constant.numeric.dart",
 					"match": "(?<!\\$)\\b((0(x|X)[0-9a-fA-F][0-9a-fA-F_]*)|(([0-9][0-9_]*\\.?[0-9_]*)|(\\.[0-9][0-9_]*))((e|E)(\\+|-)?[0-9][0-9_]*)?)\\b(?!\\$)"
+				}
+			]
+		},
+		"class-identifier-with-optional-factory-method": {
+			"patterns": [
+				{
+					"match": "(?<!\\$)\\b(bool|num|int|double|dynamic)\\b(?!\\$)\\s*(factory\\b)?",
+					"captures": {
+						"1": {
+							"name": "support.class.dart"
+						},
+						"2": {
+							"name": "entity.name.function.dart"
+						}
+					}
 				},
 				{
-					"include": "#class-identifier"
+					"match": "(?<!\\$)\\b(void)\\b(?!\\$)\\s*(factory\\b)?",
+					"captures": {
+						"1": {
+							"name": "storage.type.primitive.dart"
+						},
+						"2": {
+							"name": "entity.name.function.dart"
+						}
+					}
 				},
 				{
-					"include": "#function-identifier"
+					"begin": "(?<![a-zA-Z0-9_$])([_$]*[A-Z][a-zA-Z0-9_$]*)\\b\\s*(factory\\b)?",
+					"end": "(?!<)",
+					"beginCaptures": {
+						"1": {
+							"name": "support.class.dart"
+						},
+						"2": {
+							"name": "entity.name.function.dart"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#type-args"
+						}
+					]
 				}
-
 			]
 		},
 		"class-identifier": {
@@ -279,6 +321,10 @@
 							]
 						}
 					}
+				},
+				{
+					"match": "(?<=\\.)new\\b",
+					"name": "entity.name.function.dart"
 				}
 			]
 		},
@@ -334,8 +380,8 @@
 					"match": "(?<!\\$)\\bassert\\b(?!\\$)"
 				},
 				{
-					"name": "keyword.control.new.dart",
-					"match": "(?<!\\$)\\b(new)\\b(?!\\$)"
+					"name": "keyword.new.dart",
+					"match": "(?<![\\$\\.])\\b(new)\\b(?!\\$)"
 				},
 				{
 					"name": "keyword.control.return.dart",
@@ -351,7 +397,7 @@
 				},
 				{
 					"name": "storage.type.primitive.dart",
-					"match": "(?<!\\$)\\b(?:void|var)\\b(?!\\$)"
+					"match": "(?<!\\$)\\b(?:var)\\b(?!\\$)"
 				}
 			]
 		},
@@ -408,6 +454,12 @@
 				{
 					"include": "#constants-and-special-vars"
 				},
+				{
+					"include": "#class-identifier-with-optional-factory-method"
+				},
+				{
+					"include": "#function-identifier"
+				},
 				{
 					"include": "#strings"
 				},

packages/devtools_app/benchmark/devtools_benchmarks_test.dart

@@ -5,10 +5,10 @@
 // Note: this test was modeled after the example test from Flutter Gallery:
 // https://github.com/flutter/gallery/blob/master/test_benchmarks/benchmarks_test.dart
 
-import 'dart:convert' show JsonEncoder;
 import 'dart:io';
 
 import 'package:collection/collection.dart';
+import 'package:devtools_app/src/shared/primitives/utils.dart';
 import 'package:devtools_test/helpers.dart';
 import 'package:test/test.dart';
 import 'package:web_benchmarks/metrics.dart';
@@ -92,10 +92,7 @@ Future<void> _runBenchmarks({bool useWasm = false}) async {
 
   stdout.writeln('Web benchmark tests finished.');
 
-  expect(
-    const JsonEncoder.withIndent('  ').convert(taskResult.toJson()),
-    isA<String>(),
-  );
+  expect(prettyPrintJson(taskResult.toJson()), isA<String>());
   expect(taskResult.scores.keys, hasLength(DevToolsBenchmark.values.length));
 
   for (final devToolsBenchmark in DevToolsBenchmark.values) {

packages/devtools_app/benchmark/scripts/compare_benchmarks.dart

@@ -5,6 +5,7 @@
 import 'dart:convert';
 import 'dart:io';
 
+import 'package:devtools_app/src/shared/primitives/utils.dart';
 import 'package:web_benchmarks/analysis.dart';
 
 import 'utils.dart';
@@ -61,6 +62,6 @@ void compareBenchmarks(
   stdout.writeln('Baseline comparison finished.');
   stdout
     ..writeln('==== Comparison with baseline $baselineSource ====')
-    ..writeln(const JsonEncoder.withIndent('  ').convert(delta.toJson()))
+    ..writeln(prettyPrintJson(delta.toJson()))
     ..writeln('==== End of baseline comparison ====');
 }

packages/devtools_app/integration_test/test_infra/run/_test_app_driver.dart

@@ -389,11 +389,9 @@ final class FlutterDaemonConstants {
   static const paramsKey = 'params';
   static const traceKey = 'trace';
   static const wsUriKey = 'wsUri';
-  static const pidKey = 'pid';
   static const appStopKey = 'app.stop';
   static const appStartedKey = 'app.started';
   static const appDebugPortKey = 'app.debugPort';
-  static const daemonConnectedKey = 'daemon.connected';
 }
 
 enum TestAppDevice {

packages/devtools_app/lib/src/screens/debugger/span_parser.dart

@@ -3,11 +3,12 @@
 // found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
 
 import 'dart:collection';
-import 'dart:convert';
 
 import 'package:collection/collection.dart';
 import 'package:string_scanner/string_scanner.dart';
 
+import '../../shared/primitives/utils.dart';
+
 //TODO(jacobr): cleanup.
 /// A namespace for [SpanParser] utilities.
 extension SpanParser on Never {
@@ -68,7 +69,7 @@ class Grammar {
 
   @override
   String toString() {
-    return const JsonEncoder.withIndent('  ').convert({
+    return prettyPrintJson({
       'name': name,
       'scopeName': scopeName,
       'topLevelMatcher': topLevelMatcher.toJson(),

packages/devtools_app/lib/src/screens/debugger/syntax_highlighter.dart

@@ -247,9 +247,7 @@ class SyntaxHighlighter {
       'keyword.control.catch-exception.dart',
       'keyword.control.dart',
       'keyword.control.return.dart',
-      // While 'new' is not a control flow keyword, it uses the control flow
-      // color scheme so we include it here.
-      'keyword.control.new.dart',
+      'keyword.new.dart',
     ];
 
     const stringScopes = <String>[

packages/devtools_app/lib/src/screens/inspector/inspector_tree_controller.dart

@@ -120,8 +120,7 @@ class InspectorTreeController extends DisposableController
   /// [InspectorTreeController].
   final int? gaId;
 
-  InspectorTreeNode createNode() =>
-      InspectorTreeNode(whenDirty: _handleDirtyNode);
+  InspectorTreeNode createNode() => InspectorTreeNode();
 
   SearchTargetType _searchTarget = SearchTargetType.widget;
   int _rootSetCount = 0;
@@ -284,15 +283,6 @@ class InspectorTreeController extends DisposableController
     }
   }
 
-  /// Resets the state if the root has been marked as dirty.
-  void _handleDirtyNode(InspectorTreeNode node) {
-    if (node == root) {
-      _cachedSelectedRow = null;
-      lastContentWidth = null;
-      _updateRows();
-    }
-  }
-
   void setSearchTarget(SearchTargetType searchTarget) {
     _searchTarget = searchTarget;
     refreshSearchMatches();
@@ -448,10 +438,6 @@ class InspectorTreeController extends DisposableController
     return inspectorRowHeight * index;
   }
 
-  void nodeChanged(InspectorTreeNode node) {
-    node.isDirty = true;
-  }
-
   void removeNodeFromParent(InspectorTreeNode node) {
     node.parent?.removeChild(node);
   }
@@ -767,7 +753,6 @@ class InspectorTreeController extends DisposableController
           setupChildren(diagnostic, treeNode, children, expandChildren: true);
           refreshTree(
             updateTreeAction: () {
-              nodeChanged(treeNode);
               if (treeNode == selection) {
                 expandPath(treeNode);
               }

packages/devtools_app/lib/src/screens/logging/logging_controller.dart

@@ -1016,8 +1016,6 @@ class LogData with SearchableDataMixin {
   String? _details;
   Future<String> Function()? detailsComputer;
 
-  static const prettyPrinter = JsonEncoder.withIndent('  ');
-
   String? get details => _details;
 
   bool get needsComputing => !detailsComputed.isCompleted;
@@ -1040,10 +1038,9 @@ class LogData with SearchableDataMixin {
     }
 
     try {
-      return prettyPrinter
-          .convert(jsonDecode(details!))
-          .replaceAll(r'\n', '\n')
-          .trim();
+      return prettyPrintJson(
+        jsonDecode(details!) as Object?,
+      ).replaceAll(r'\n', '\n').trim();
     } catch (_) {
       return details?.trim();
     }

packages/devtools_app/lib/src/shared/analytics/_analytics_web.dart

@@ -3,6 +3,7 @@
 // found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
 
 // ignore_for_file: non_constant_identifier_names
+// ignore_for_file: unused-code, platform specific imports.
 
 import 'dart:async';