Cleanup unsused configuration paths

Towards: dart-lang#1878

Author: Anna Gringauze

dwds/lib/dart_web_debug_service.dart

@@ -21,7 +21,6 @@ import 'src/readers/asset_reader.dart';
 import 'src/servers/devtools.dart';
 import 'src/servers/extension_backend.dart';
 import 'src/services/expression_compiler.dart';
-import 'src/utilities/sdk_configuration.dart';
 
 typedef ConnectionProvider = Future<ChromeConnection> Function();
 
@@ -84,8 +83,6 @@ class Dwds {
     bool enableDevtoolsLaunch = true,
     DevtoolsLauncher? devtoolsLauncher,
     bool launchDevToolsInNewWindow = true,
-    SdkConfigurationProvider sdkConfigurationProvider =
-        const DefaultSdkConfigurationProvider(),
     bool emitDebugEvents = true,
     bool isInternalBuild = false,
     bool isFlutterApp = false,
@@ -148,7 +145,6 @@ class Dwds {
       injected,
       spawnDds,
       launchDevToolsInNewWindow,
-      sdkConfigurationProvider,
     );
 
     return Dwds._(

dwds/lib/src/debugging/inspector.dart

@@ -14,7 +14,6 @@ import '../readers/asset_reader.dart';
 import '../utilities/conversions.dart';
 import '../utilities/dart_uri.dart';
 import '../utilities/domain.dart';
-import '../utilities/sdk_configuration.dart';
 import '../utilities/shared.dart';
 import 'classes.dart';
 import 'debugger.dart';
@@ -75,7 +74,6 @@ class AppInspector implements AppInspectorInterface {
 
   /// The root URI from which the application is served.
   final String _root;
-  final SdkConfiguration _sdkConfiguration;
 
   /// JavaScript expression that evaluates to the Dart stack trace mapper.
   static const stackTraceMapperExpression = '\$dartStackTraceUtility.mapper';
@@ -98,7 +96,6 @@ class AppInspector implements AppInspectorInterface {
     this._locations,
     this._root,
     this._executionContext,
-    this._sdkConfiguration,
   ) : _isolateRef = _toIsolateRef(_isolate);
 
   Future<void> initialize(
@@ -116,7 +113,7 @@ class AppInspector implements AppInspectorInterface {
 
     final scripts = await scriptRefs;
 
-    await DartUri.initialize(_sdkConfiguration);
+    await DartUri.initialize();
     await DartUri.recordAbsoluteUris(
         libraries.map((lib) => lib.uri).whereNotNull());
     await DartUri.recordAbsoluteUris(
@@ -140,7 +137,6 @@ class AppInspector implements AppInspectorInterface {
     String root,
     Debugger debugger,
     ExecutionContext executionContext,
-    SdkConfiguration sdkConfiguration,
   ) async {
     final id = createId();
     final time = DateTime.now().millisecondsSinceEpoch;
@@ -176,7 +172,6 @@ class AppInspector implements AppInspectorInterface {
       locations,
       root,
       executionContext,
-      sdkConfiguration,
     );
 
     debugger.updateInspector(inspector);

dwds/lib/src/handlers/dev_handler.dart

@@ -36,7 +36,6 @@ import '../servers/extension_backend.dart';
 import '../services/app_debug_services.dart';
 import '../services/debug_service.dart';
 import '../services/expression_compiler.dart';
-import '../utilities/sdk_configuration.dart';
 import 'injector.dart';
 
 /// When enabled, this logs VM service protocol and Chrome debug protocol
@@ -72,7 +71,6 @@ class DevHandler {
   final bool _launchDevToolsInNewWindow;
   final ExpressionCompiler? _expressionCompiler;
   final DwdsInjector _injected;
-  final SdkConfigurationProvider _sdkConfigurationProvider;
 
   /// Null until [close] is called.
   ///
@@ -96,7 +94,6 @@ class DevHandler {
     this._injected,
     this._spawnDds,
     this._launchDevToolsInNewWindow,
-    this._sdkConfigurationProvider,
   ) {
     _subs.add(buildResults.listen(_emitBuildResults));
     _listen();
@@ -219,7 +216,6 @@ class DevHandler {
       useSse: false,
       expressionCompiler: _expressionCompiler,
       spawnDds: _spawnDds,
-      sdkConfigurationProvider: _sdkConfigurationProvider,
     );
   }
 
@@ -532,7 +528,6 @@ class DevHandler {
           useSse: _useSseForDebugProxy,
           expressionCompiler: _expressionCompiler,
           spawnDds: _spawnDds,
-          sdkConfigurationProvider: _sdkConfigurationProvider,
         );
         appServices = await _createAppDebugServices(
           devToolsRequest.appId,

dwds/lib/src/services/chrome_proxy_service.dart

@@ -27,7 +27,6 @@ import '../loaders/strategy.dart';
 import '../readers/asset_reader.dart';
 import '../services/expression_compiler.dart';
 import '../utilities/dart_uri.dart';
-import '../utilities/sdk_configuration.dart';
 import '../utilities/shared.dart';
 import 'expression_evaluator.dart';
 import 'batched_expression_evaluator.dart';
@@ -100,8 +99,6 @@ class ChromeProxyService implements VmServiceInterface {
   final ExpressionCompiler? _compiler;
   ExpressionEvaluator? _expressionEvaluator;
 
-  final SdkConfigurationProvider _sdkConfigurationProvider;
-
   bool terminatingIsolates = false;
 
   ChromeProxyService._(
@@ -114,7 +111,6 @@ class ChromeProxyService implements VmServiceInterface {
     this._skipLists,
     this.executionContext,
     this._compiler,
-    this._sdkConfigurationProvider,
   ) {
     final debugger = Debugger.create(
       remoteDebugger,
@@ -134,7 +130,6 @@ class ChromeProxyService implements VmServiceInterface {
     AppConnection appConnection,
     ExecutionContext executionContext,
     ExpressionCompiler? expressionCompiler,
-    SdkConfigurationProvider sdkConfigurationProvider,
   ) async {
     final vm = VM(
       name: 'ChromeDebugProxy',
@@ -164,7 +159,6 @@ class ChromeProxyService implements VmServiceInterface {
       skipLists,
       executionContext,
       expressionCompiler,
-      sdkConfigurationProvider,
     );
     unawaited(service.createIsolate(appConnection));
     return service;
@@ -252,7 +246,6 @@ class ChromeProxyService implements VmServiceInterface {
     final debugger = await debuggerFuture;
     final entrypoint = appConnection.request.entrypointPath;
     await _initializeEntrypoint(entrypoint);
-    final sdkConfiguration = await _sdkConfigurationProvider.configuration;
 
     debugger.notifyPausedAtStart();
     _inspector = await AppInspector.create(
@@ -263,7 +256,6 @@ class ChromeProxyService implements VmServiceInterface {
       root,
       debugger,
       executionContext,
-      sdkConfiguration,
     );
     debugger.updateInspector(inspector);
 

dwds/lib/src/services/debug_service.dart

@@ -25,7 +25,6 @@ import '../debugging/execution_context.dart';
 import '../debugging/remote_debugger.dart';
 import '../events.dart';
 import '../utilities/shared.dart';
-import '../utilities/sdk_configuration.dart';
 import 'chrome_proxy_service.dart';
 
 bool _acceptNewConnections = true;
@@ -219,7 +218,6 @@ class DebugService {
     bool spawnDds = true,
     bool useSse = false,
     ExpressionCompiler? expressionCompiler,
-    required SdkConfigurationProvider sdkConfigurationProvider,
   }) async {
     final chromeProxyService = await ChromeProxyService.create(
       remoteDebugger,
@@ -229,7 +227,6 @@ class DebugService {
       appConnection,
       executionContext,
       expressionCompiler,
-      sdkConfigurationProvider,
     );
     final authToken = _makeAuthToken();
     final serviceExtensionRegistry = ServiceExtensionRegistry();

dwds/lib/src/services/expression_compiler_service.dart

@@ -73,16 +73,13 @@ class _Compiler {
   ) async {
     sdkConfiguration.validate();
 
-    final librariesUri = sdkConfiguration.librariesUri!;
     final workerUri = sdkConfiguration.compilerWorkerUri!;
     final sdkSummaryUri = soundNullSafety
         ? sdkConfiguration.soundSdkSummaryUri!
         : sdkConfiguration.weakSdkSummaryUri!;
 
     final args = [
       '--experimental-expression-compiler',
-      '--libraries-file',
-      '$librariesUri',
       '--dart-sdk-summary',
       '$sdkSummaryUri',
       '--asset-server-address',

dwds/lib/src/utilities/dart_uri.dart

@@ -7,7 +7,6 @@ import 'package:package_config/package_config.dart';
 import 'package:path/path.dart' as p;
 
 import '../loaders/strategy.dart';
-import 'sdk_configuration.dart';
 
 /// The URI for a particular Dart file, able to canonicalize from various
 /// different representations.
@@ -152,17 +151,11 @@ class DartUri {
   static String currentDirectoryUri = '${p.toUri(currentDirectory)}';
 
   /// Record library and script uris to enable resolving library and script paths.
-  static Future<void> initialize(SdkConfiguration sdkConfiguration) async {
+  static Future<void> initialize() async {
     final packagesUri =
         p.toUri(p.join(currentDirectory, '.dart_tool/package_config.json'));
 
     clear();
-
-    // Allow for tests to supply empty configurations.
-    if (sdkConfiguration.sdkDirectory != null) {
-      sdkConfiguration.validateSdkDir();
-    }
-
     await _loadPackageConfig(packagesUri);
   }
 

dwds/lib/src/utilities/sdk_configuration.dart

@@ -161,14 +161,12 @@ class SdkConfiguration {
   String? sdkDirectory;
   String? weakSdkSummaryPath;
   String? soundSdkSummaryPath;
-  String? librariesPath;
   String? compilerWorkerPath;
 
   SdkConfiguration({
     this.sdkDirectory,
     this.weakSdkSummaryPath,
     this.soundSdkSummaryPath,
-    this.librariesPath,
     this.compilerWorkerPath,
   });
 
@@ -179,7 +177,6 @@ class SdkConfiguration {
           sdkDirectory: sdkLayout.sdkDirectory,
           weakSdkSummaryPath: sdkLayout.weakSummaryPath,
           soundSdkSummaryPath: sdkLayout.soundSummaryPath,
-          librariesPath: sdkLayout.librariesPath,
           compilerWorkerPath: sdkLayout.dartdevcSnapshotPath,
         );
 
@@ -190,7 +187,6 @@ class SdkConfiguration {
   Uri? get sdkDirectoryUri => _toUri(sdkDirectory);
   Uri? get soundSdkSummaryUri => _toUri(soundSdkSummaryPath);
   Uri? get weakSdkSummaryUri => _toUri(weakSdkSummaryPath);
-  Uri? get librariesUri => _toUri(librariesPath);
 
   /// Note: has to be ///file: Uri to run in an isolate.
   Uri? get compilerWorkerUri => _toAbsoluteUri(compilerWorkerPath);
@@ -200,7 +196,6 @@ class SdkConfiguration {
   void validate({FileSystem fileSystem = const LocalFileSystem()}) {
     validateSdkDir(fileSystem: fileSystem);
     validateSummaries(fileSystem: fileSystem);
-    validateLibrariesSpec(fileSystem: fileSystem);
     validateCompilerWorker(fileSystem: fileSystem);
   }
 
@@ -237,14 +232,6 @@ class SdkConfiguration {
     }
   }
 
-  void validateLibrariesSpec(
-      {FileSystem fileSystem = const LocalFileSystem()}) {
-    if (librariesPath == null || !fileSystem.file(librariesPath).existsSync()) {
-      throw InvalidSdkConfigurationException(
-          'Libraries spec $librariesPath does not exist');
-    }
-  }
-
   void validateCompilerWorker(
       {FileSystem fileSystem = const LocalFileSystem()}) {
     if (compilerWorkerPath == null ||