diff --git a/packages/devtools_app/lib/src/framework/framework_core.dart b/packages/devtools_app/lib/src/framework/framework_core.dart index 87a3f219ec5..d7c4ac5ec88 100644 --- a/packages/devtools_app/lib/src/framework/framework_core.dart +++ b/packages/devtools_app/lib/src/framework/framework_core.dart @@ -44,8 +44,8 @@ typedef ErrorReporter = void Function(String title, Object error); final _log = Logger('framework_core'); -// ignore: avoid_classes_with_only_static_members, intentional grouping of static methods. -abstract class FrameworkCore { +/// A namespace for core framework objects and methods. +extension FrameworkCore on Never { static final _memoryObserver = MemoryObserver(); /// Initializes the DevTools framework, which includes setting up global diff --git a/packages/devtools_app/lib/src/screens/debugger/debugger_model.dart b/packages/devtools_app/lib/src/screens/debugger/debugger_model.dart index 7dc18d8bc3b..12affb77fdf 100644 --- a/packages/devtools_app/lib/src/screens/debugger/debugger_model.dart +++ b/packages/devtools_app/lib/src/screens/debugger/debugger_model.dart @@ -236,8 +236,8 @@ class StackFrameAndSourcePosition { } } -// ignore: avoid_classes_with_only_static_members, fine for utility method. -abstract class ScriptRefUtils { +/// A namespace for [ScriptRef] utilities. +extension ScriptRefUtils on Never { static String fileName(ScriptRef scriptRef) => fileNameFromUri(Uri.parse(scriptRef.uri!).path)!; } diff --git a/packages/devtools_app/lib/src/screens/debugger/span_parser.dart b/packages/devtools_app/lib/src/screens/debugger/span_parser.dart index c6d3511458c..69c96c48ffc 100644 --- a/packages/devtools_app/lib/src/screens/debugger/span_parser.dart +++ b/packages/devtools_app/lib/src/screens/debugger/span_parser.dart @@ -9,8 +9,8 @@ import 'package:collection/collection.dart'; import 'package:string_scanner/string_scanner.dart'; //TODO(jacobr): cleanup. -// ignore: avoid_classes_with_only_static_members -abstract class SpanParser { +/// A namespace for [SpanParser] utilities. +extension SpanParser on Never { /// Takes a TextMate [Grammar] and a [String] and outputs a list of /// [ScopeSpan]s corresponding to the parsed input. static List parse(Grammar grammar, String src) { diff --git a/packages/devtools_app/lib/src/screens/memory/panes/chart/controller/charts/android_chart_controller.dart b/packages/devtools_app/lib/src/screens/memory/panes/chart/controller/charts/android_chart_controller.dart index 12d1bfade6f..247615b6eae 100644 --- a/packages/devtools_app/lib/src/screens/memory/panes/chart/controller/charts/android_chart_controller.dart +++ b/packages/devtools_app/lib/src/screens/memory/panes/chart/controller/charts/android_chart_controller.dart @@ -13,8 +13,8 @@ import '../../../../../../shared/charts/chart_trace.dart' import '../../../../shared/primitives/memory_timeline.dart'; import '../../data/charts.dart'; -// ignore: avoid_classes_with_only_static_members, enum-like classes are ok -class _Color { +/// A namespace for Android memory chart color constants. +extension _Color on Never { static const otherColor = Color(0xffff8800); // HoloOrangeDark; static const nativeHeapColor = Color(0xff33b5e5); // HoloBlueLight static final graphicColor = Colors.greenAccent.shade400; diff --git a/packages/devtools_app/lib/src/screens/memory/panes/chart/controller/charts/vm_chart_controller.dart b/packages/devtools_app/lib/src/screens/memory/panes/chart/controller/charts/vm_chart_controller.dart index a8c5df9f7e3..a84a8dc67aa 100644 --- a/packages/devtools_app/lib/src/screens/memory/panes/chart/controller/charts/vm_chart_controller.dart +++ b/packages/devtools_app/lib/src/screens/memory/panes/chart/controller/charts/vm_chart_controller.dart @@ -13,8 +13,8 @@ import '../../../../../../shared/charts/chart_trace.dart' import '../../../../shared/primitives/memory_timeline.dart'; import '../../data/charts.dart'; -// ignore: avoid_classes_with_only_static_members, enum-like classes are ok -class _Colors { +/// A namespace for VM memory chart color constants. +extension _Colors on Never { static final capacity = Colors.grey[400]!; static const used = Color(0xff33b5e5); static const externals = Color(0xff4ddeff); diff --git a/packages/devtools_app/lib/src/shared/analytics/constants/_property_editor_sidebar_constants.dart b/packages/devtools_app/lib/src/shared/analytics/constants/_property_editor_sidebar_constants.dart index 3e903f9cbeb..73a1882aa1b 100644 --- a/packages/devtools_app/lib/src/shared/analytics/constants/_property_editor_sidebar_constants.dart +++ b/packages/devtools_app/lib/src/shared/analytics/constants/_property_editor_sidebar_constants.dart @@ -4,8 +4,8 @@ part of '../constants.dart'; -// ignore: avoid_classes_with_only_static_members, used for namespacing. -class PropertyEditorSidebar { +/// A namespace for Property Editor analytics. +extension PropertyEditorSidebar on Never { /// Analytics id to track events that come from the DTD editor sidebar. static String get id => 'propertyEditorSidebar'; diff --git a/packages/devtools_app/lib/src/shared/analytics/gtags.dart b/packages/devtools_app/lib/src/shared/analytics/gtags.dart index 87564ddea18..4e43b03772b 100644 --- a/packages/devtools_app/lib/src/shared/analytics/gtags.dart +++ b/packages/devtools_app/lib/src/shared/analytics/gtags.dart @@ -21,8 +21,8 @@ import 'analytics.dart' as ga; external void _gTagCommandName(String command, String name, [JSObject? params]); // TODO(jacobr): refactor this code if we do not migrate off gtags. -// ignore: avoid_classes_with_only_static_members -class GTag { +/// A namespace for gtags. +extension GTag on Never { static const _event = 'event'; static const _exception = 'exception'; diff --git a/packages/devtools_app/lib/src/shared/charts/flame_chart.dart b/packages/devtools_app/lib/src/shared/charts/flame_chart.dart index 5151208b286..ce5b4149bbb 100644 --- a/packages/devtools_app/lib/src/shared/charts/flame_chart.dart +++ b/packages/devtools_app/lib/src/shared/charts/flame_chart.dart @@ -889,9 +889,8 @@ extension NodeListExtension on List { } } -// TODO(jacobr): cleanup up this util class with just static members. -// ignore: avoid_classes_with_only_static_members -class FlameChartUtils { +/// A namespace for flame chart utilities. +extension FlameChartUtils on Never { static double leftPaddingForNode( int index, List nodes, { diff --git a/packages/devtools_app/lib/src/shared/development_helpers.dart b/packages/devtools_app/lib/src/shared/development_helpers.dart index 770016a560d..1ade4bf20e3 100644 --- a/packages/devtools_app/lib/src/shared/development_helpers.dart +++ b/packages/devtools_app/lib/src/shared/development_helpers.dart @@ -84,8 +84,10 @@ void resetDevToolsExtensionEnabledStates() => /// server connection. final stubExtensionEnabledStates = {}; -// ignore: avoid_classes_with_only_static_members, useful for testing. -abstract class StubDevToolsExtensions { +/// A namespace for stubbed DevTools extensions. +/// +/// These are useful for testing and local development. +extension StubDevToolsExtensions on Never { /// Extension for package:foo detected from a running app that requires a /// connected app. static final fooExtension = DevToolsExtensionConfig.parse({ diff --git a/packages/devtools_app/lib/src/shared/feature_flags.dart b/packages/devtools_app/lib/src/shared/feature_flags.dart index d3dc5730d6c..c15e1298b80 100644 --- a/packages/devtools_app/lib/src/shared/feature_flags.dart +++ b/packages/devtools_app/lib/src/shared/feature_flags.dart @@ -41,13 +41,12 @@ const _kNetworkDisconnectExperience = bool.fromEnvironment( defaultValue: true, ); -// It is ok to have enum-like static only classes. -// ignore: avoid_classes_with_only_static_members -/// Flags to hide features under construction. +/// A namespace for feature flags, which set the visibility of features under +/// active development. /// /// When adding a new feature flag, the developer is responsible for adding it /// to the [_allFlags] map for debugging purposes. -abstract class FeatureFlags { +extension FeatureFlags on Never { /// Flag to enable the DevTools memory observer, which attempts to help users /// avoid OOM crashes. /// diff --git a/packages/devtools_app/lib/src/shared/http/_http_date.dart b/packages/devtools_app/lib/src/shared/http/_http_date.dart index 863eff93507..38f31d97bbc 100644 --- a/packages/devtools_app/lib/src/shared/http/_http_date.dart +++ b/packages/devtools_app/lib/src/shared/http/_http_date.dart @@ -14,10 +14,8 @@ part of 'http.dart'; -// TODO(jacobr): cleanup this class with only static members. -// ignore: avoid_classes_with_only_static_members -/// Utility functions for working with dates with HTTP specific date formats. -class HttpDate { +/// A namespace for HTTP date utilities. +extension HttpDate on Never { // Parse a cookie date string. static DateTime _parseCookieDate(String date) { const monthsLowerCase = const [ diff --git a/packages/devtools_app/lib/src/shared/primitives/diagnostics_text_styles.dart b/packages/devtools_app/lib/src/shared/primitives/diagnostics_text_styles.dart index c8aafc05600..5773f02f3c2 100644 --- a/packages/devtools_app/lib/src/shared/primitives/diagnostics_text_styles.dart +++ b/packages/devtools_app/lib/src/shared/primitives/diagnostics_text_styles.dart @@ -5,9 +5,8 @@ import 'package:devtools_app_shared/ui.dart'; import 'package:flutter/material.dart'; -// Enum-like static classes are ok. -// ignore: avoid_classes_with_only_static_members -class DiagnosticsTextStyles { +/// A namespace for diagnostic text styles and utilities. +extension DiagnosticsTextStyles on Never { static TextStyle unimportant(ColorScheme colorScheme) => TextStyle( color: colorScheme.isLight ? Colors.grey.shade500 : Colors.grey.shade600, ); diff --git a/packages/devtools_app/lib/src/shared/utils/utils.dart b/packages/devtools_app/lib/src/shared/utils/utils.dart index 4d05451b999..c1db55d2ab5 100644 --- a/packages/devtools_app/lib/src/shared/utils/utils.dart +++ b/packages/devtools_app/lib/src/shared/utils/utils.dart @@ -18,6 +18,7 @@ import 'package:flutter/widgets.dart'; import 'package:logging/logging.dart'; import 'package:vm_service/vm_service.dart'; +// ignore: avoid-importing-entrypoint-exports, required to access version. import '../../../devtools.dart' as devtools; import '../../service/connected_app/connected_app.dart'; import '../framework/app_error_handling.dart'; diff --git a/packages/devtools_app/test/screens/memory/tracing/tracing_pane_controller_test.dart b/packages/devtools_app/test/screens/memory/tracing/tracing_pane_controller_test.dart index 1d9849e5f04..151559fa669 100644 --- a/packages/devtools_app/test/screens/memory/tracing/tracing_pane_controller_test.dart +++ b/packages/devtools_app/test/screens/memory/tracing/tracing_pane_controller_test.dart @@ -7,8 +7,8 @@ import 'package:devtools_app/src/screens/memory/panes/tracing/tracing_pane_contr import 'package:flutter_test/flutter_test.dart'; import 'package:vm_service/vm_service.dart'; -// ignore: avoid_classes_with_only_static_members, ok for enum-like class -class _Tests { +/// A namespace for memory tracing tests. +extension _Tests on Never { static final empty = TracePaneController(rootPackage: ''); static final selection = TracePaneController( diff --git a/packages/devtools_app/test/test_infra/scenes/memory/default.dart b/packages/devtools_app/test/test_infra/scenes/memory/default.dart index f9f15a12675..b04c251471f 100644 --- a/packages/devtools_app/test/test_infra/scenes/memory/default.dart +++ b/packages/devtools_app/test/test_infra/scenes/memory/default.dart @@ -27,8 +27,8 @@ import '../scene_test_extensions.dart'; // To run: // flutter run -t test/test_infra/scenes/memory/default.stager_app.g.dart -d macos -// ignore: avoid_classes_with_only_static_members, enum like classes are ok -abstract class MemoryDefaultSceneHeaps { +/// A namespace for stubbed data used in memory tests. +extension MemoryDefaultSceneHeaps on Never { /// Many instances of the same class with different long paths. /// /// If sorted by retaining path this class will be the second from the top. diff --git a/packages/devtools_app/test/test_infra/test_data/performance/sample_performance_data.dart b/packages/devtools_app/test/test_infra/test_data/performance/sample_performance_data.dart index 12894d799cd..8a9362ca124 100644 --- a/packages/devtools_app/test/test_infra/test_data/performance/sample_performance_data.dart +++ b/packages/devtools_app/test/test_infra/test_data/performance/sample_performance_data.dart @@ -4,8 +4,6 @@ // This is the Perfetto data from [samplePerformanceData] as data class objects. -// ignore_for_file: avoid_classes_with_only_static_members - import 'dart:convert'; import 'package:devtools_app/devtools_app.dart'; @@ -129,7 +127,7 @@ final timelineEventWithShaderJank = testTimelineEvent( ); /// Data for Frame (id: 2) -abstract class FlutterFrame2 { +extension FlutterFrame2 on Never { static final frame = FlutterFrame.fromJson({ 'number': 2, @@ -364,7 +362,7 @@ abstract class FlutterFrame2 { } /// Data for Frame (id: 4) -abstract class FlutterFrame4 { +extension FlutterFrame4 on Never { static final frame = FlutterFrame.fromJson(_frameJson) ..setEventFlow(uiEvent) ..setEventFlow(rasterEvent); @@ -929,7 +927,7 @@ abstract class FlutterFrame4 { } /// Data for Frame (id: 6) -abstract class FlutterFrame6 { +extension FlutterFrame6 on Never { static final frame = FlutterFrame.fromJson(_frameJson) ..setEventFlow(uiEvent) ..setEventFlow(rasterEvent); diff --git a/packages/devtools_shared/lib/src/server/file_system.dart b/packages/devtools_shared/lib/src/server/file_system.dart index 18f2a0baeaa..80d24409b5f 100644 --- a/packages/devtools_shared/lib/src/server/file_system.dart +++ b/packages/devtools_shared/lib/src/server/file_system.dart @@ -9,8 +9,8 @@ import 'package:path/path.dart' as path; import 'devtools_store.dart'; -// ignore: avoid_classes_with_only_static_members, requires refactor. -class LocalFileSystem { +/// A namespace local file system utlities. +extension LocalFileSystem on Never { static String _userHomeDir() { final envKey = Platform.operatingSystem == 'windows' ? 'APPDATA' : 'HOME'; return Platform.environment[envKey] ?? '.'; diff --git a/packages/devtools_shared/lib/src/server/handlers/_app_size.dart b/packages/devtools_shared/lib/src/server/handlers/_app_size.dart index 683522764ed..f7f31a5be2b 100644 --- a/packages/devtools_shared/lib/src/server/handlers/_app_size.dart +++ b/packages/devtools_shared/lib/src/server/handlers/_app_size.dart @@ -2,11 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd. -// ignore_for_file: avoid_classes_with_only_static_members - part of '../server_api.dart'; -abstract class _AppSizeHandler { +/// A namespace for app size server request handlers. +extension _AppSizeHandler on Never { static shelf.Response getBaseAppSizeFile( ServerApi api, Map queryParams, diff --git a/packages/devtools_shared/lib/src/server/handlers/_deeplink.dart b/packages/devtools_shared/lib/src/server/handlers/_deeplink.dart index c65f749f57b..b5c86417bfe 100644 --- a/packages/devtools_shared/lib/src/server/handlers/_deeplink.dart +++ b/packages/devtools_shared/lib/src/server/handlers/_deeplink.dart @@ -2,11 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd. -// ignore_for_file: avoid_classes_with_only_static_members - part of '../server_api.dart'; -abstract class _DeeplinkApiHandler { +/// A namespace for deep link server request handlers. +extension _DeeplinkApiHandler on Never { static Future handleAndroidBuildVariants( ServerApi api, Map queryParams, diff --git a/packages/devtools_shared/lib/src/server/handlers/_devtools_extensions.dart b/packages/devtools_shared/lib/src/server/handlers/_devtools_extensions.dart index 3e2172530b5..f7c63671630 100644 --- a/packages/devtools_shared/lib/src/server/handlers/_devtools_extensions.dart +++ b/packages/devtools_shared/lib/src/server/handlers/_devtools_extensions.dart @@ -2,11 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd. -// ignore_for_file: avoid_classes_with_only_static_members - part of '../server_api.dart'; -abstract class _ExtensionsApiHandler { +/// A namespace for DevTools extensions server request handlers. +extension _ExtensionsApiHandler on Never { static Future handleServeAvailableExtensions( ServerApi api, Map queryParams, diff --git a/packages/devtools_shared/lib/src/server/handlers/_dtd.dart b/packages/devtools_shared/lib/src/server/handlers/_dtd.dart index 5b6fb59d5cb..b7f381b4b3e 100644 --- a/packages/devtools_shared/lib/src/server/handlers/_dtd.dart +++ b/packages/devtools_shared/lib/src/server/handlers/_dtd.dart @@ -2,11 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd. -// ignore_for_file: avoid_classes_with_only_static_members - part of '../server_api.dart'; -abstract class _DtdApiHandler { +/// A namespace for Dart Tooling Daemon (DTD) server request handlers. +extension _DtdApiHandler on Never { static shelf.Response handleGetDtdUri( ServerApi api, DtdInfo? dtd, diff --git a/packages/devtools_shared/lib/src/server/handlers/_preferences.dart b/packages/devtools_shared/lib/src/server/handlers/_preferences.dart index 400e02fd89c..e5b69f62a27 100644 --- a/packages/devtools_shared/lib/src/server/handlers/_preferences.dart +++ b/packages/devtools_shared/lib/src/server/handlers/_preferences.dart @@ -2,11 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd. -// ignore_for_file: avoid_classes_with_only_static_members - part of '../server_api.dart'; -abstract class _PreferencesApiHandler { +/// A namespace for preferences server request handlers. +extension _PreferencesApiHandler on Never { static shelf.Response getPreferenceValue( ServerApi api, Map queryParams, diff --git a/packages/devtools_shared/lib/src/server/handlers/_release_notes.dart b/packages/devtools_shared/lib/src/server/handlers/_release_notes.dart index 2382088a82f..492bedc01a8 100644 --- a/packages/devtools_shared/lib/src/server/handlers/_release_notes.dart +++ b/packages/devtools_shared/lib/src/server/handlers/_release_notes.dart @@ -2,11 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd. -// ignore_for_file: avoid_classes_with_only_static_members - part of '../server_api.dart'; -abstract class _ReleaseNotesHandler { +/// A namespace for release notes server request handlers. +extension _ReleaseNotesHandler on Never { static shelf.Response getLastReleaseNotesVersion( ServerApi api, DevToolsUsage devToolsStore, diff --git a/packages/devtools_shared/lib/src/server/handlers/_storage.dart b/packages/devtools_shared/lib/src/server/handlers/_storage.dart index deeea33bd69..391447e3d7a 100644 --- a/packages/devtools_shared/lib/src/server/handlers/_storage.dart +++ b/packages/devtools_shared/lib/src/server/handlers/_storage.dart @@ -2,11 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd. -// ignore_for_file: avoid_classes_with_only_static_members - part of '../server_api.dart'; -abstract class _StorageHandler { +/// A namespace for local storage request handlers. +extension _StorageHandler on Never { static shelf.Response handleGetStorageValue( ServerApi api, DevToolsUsage devToolsStore, { diff --git a/packages/devtools_shared/lib/src/server/handlers/_survey.dart b/packages/devtools_shared/lib/src/server/handlers/_survey.dart index 0423fd14289..40e7f98dd4f 100644 --- a/packages/devtools_shared/lib/src/server/handlers/_survey.dart +++ b/packages/devtools_shared/lib/src/server/handlers/_survey.dart @@ -2,11 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd. -// ignore_for_file: avoid_classes_with_only_static_members - part of '../server_api.dart'; -abstract class _SurveyHandler { +/// A namespace for DevTools survey server request handlers. +extension _SurveyHandler on Never { static shelf.Response setActiveSurvey( ServerApi api, Map queryParams, diff --git a/packages/devtools_shared/lib/src/server/handlers/_general.dart b/packages/devtools_shared/lib/src/server/handlers/_vm_service.dart similarity index 98% rename from packages/devtools_shared/lib/src/server/handlers/_general.dart rename to packages/devtools_shared/lib/src/server/handlers/_vm_service.dart index f8f7e3005c8..15722ffec2a 100644 --- a/packages/devtools_shared/lib/src/server/handlers/_general.dart +++ b/packages/devtools_shared/lib/src/server/handlers/_vm_service.dart @@ -2,12 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd. -// ignore_for_file: avoid_classes_with_only_static_members - part of '../server_api.dart'; +/// A namespace for VM service related server request handlers. @visibleForTesting -abstract class Handler { +extension VmServiceHandler on Never { /// Stores the calculated package roots for VM service connections that are /// initiated in [handleNotifyForVmServiceConnection]. /// @@ -68,7 +67,6 @@ abstract class Handler { vmServiceUriAsString: vmServiceUriAsString, vmServiceUri: vmServiceUri, connected: connected, - api: api, dtd: dartToolingDaemon, ); if (detectRootResponse.success) { @@ -98,7 +96,6 @@ abstract class Handler { required String vmServiceUriAsString, required Uri vmServiceUri, required bool connected, - required ServerApi api, required DartToolingDaemon dtd, }) async { final Uri rootPackageUri; diff --git a/packages/devtools_shared/lib/src/server/server_api.dart b/packages/devtools_shared/lib/src/server/server_api.dart index 8a39deb8cd2..5254041f3e5 100644 --- a/packages/devtools_shared/lib/src/server/server_api.dart +++ b/packages/devtools_shared/lib/src/server/server_api.dart @@ -32,7 +32,7 @@ part 'handlers/_app_size.dart'; part 'handlers/_deeplink.dart'; part 'handlers/_devtools_extensions.dart'; part 'handlers/_dtd.dart'; -part 'handlers/_general.dart'; +part 'handlers/_vm_service.dart'; part 'handlers/_preferences.dart'; part 'handlers/_release_notes.dart'; part 'handlers/_storage.dart'; @@ -64,7 +64,7 @@ class ServerApi { final queryParams = request.requestedUri.queryParameters; switch (request.url.path) { case apiNotifyForVmServiceConnection: - return Handler.handleNotifyForVmServiceConnection( + return VmServiceHandler.handleNotifyForVmServiceConnection( api, queryParams, dtd, diff --git a/packages/devtools_shared/test/server/general_api_test.dart b/packages/devtools_shared/test/server/general_api_test.dart index 4e2c46be605..fff2abb5aa2 100644 --- a/packages/devtools_shared/test/server/general_api_test.dart +++ b/packages/devtools_shared/test/server/general_api_test.dart @@ -115,7 +115,7 @@ void main() { required Uri root, required bool connected, }) async { - await server.Handler.updateDtdWorkspaceRoots( + await server.VmServiceHandler.updateDtdWorkspaceRoots( testDtdConnection!, dtdConnectionInfo: dtd!.info!, rootFromVmService: root, @@ -180,11 +180,11 @@ void main() { test('succeeds for a connect event', () async { final vmServiceUri = normalizeVmServiceUri(vmServiceUriString!); expect(vmServiceUri, isNotNull); - final response = await server.Handler.detectRootPackageForVmService( + final response = + await server.VmServiceHandler.detectRootPackageForVmService( vmServiceUriAsString: vmServiceUriString!, vmServiceUri: vmServiceUri!, connected: true, - api: ServerApi(), dtd: testDtdConnection!, ); expect(response.success, true); @@ -194,11 +194,11 @@ void main() { }); test('succeeds for a disconnect event when cache is empty', () async { - final response = await server.Handler.detectRootPackageForVmService( + final response = + await server.VmServiceHandler.detectRootPackageForVmService( vmServiceUriAsString: vmServiceUriString!, vmServiceUri: Uri.parse('ws://127.0.0.1:63555/fake-uri=/ws'), connected: false, - api: ServerApi(), dtd: testDtdConnection!, ); expect(response, (success: true, message: null, uri: null)); @@ -209,11 +209,11 @@ void main() { () async { final vmServiceUri = normalizeVmServiceUri(vmServiceUriString!); expect(vmServiceUri, isNotNull); - final response = await server.Handler.detectRootPackageForVmService( + final response = + await server.VmServiceHandler.detectRootPackageForVmService( vmServiceUriAsString: vmServiceUriString!, vmServiceUri: vmServiceUri!, connected: true, - api: ServerApi(), dtd: testDtdConnection!, ); expect(response.success, true); @@ -222,11 +222,10 @@ void main() { expect(response.uri!.toString(), endsWith(app!.directory.path)); final disconnectResponse = - await server.Handler.detectRootPackageForVmService( + await server.VmServiceHandler.detectRootPackageForVmService( vmServiceUriAsString: vmServiceUriString!, vmServiceUri: vmServiceUri, connected: false, - api: ServerApi(), dtd: testDtdConnection!, ); expect(disconnectResponse.success, true);