Clean up

dart-lang · Aug 17, 2023 · 10817f8 · 10817f8
1 parent 13adc82
commit 10817f8
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 7 deletions.
diff --git a/dwds/lib/src/debugging/metadata/provider.dart b/dwds/lib/src/debugging/metadata/provider.dart
@@ -6,10 +6,10 @@ import 'dart:convert';
 
 import 'package:async/async.dart';
 import 'package:dwds/src/debugging/metadata/module_metadata.dart';
+import 'package:dwds/src/loaders/strategy.dart';
 import 'package:dwds/src/readers/asset_reader.dart';
 import 'package:logging/logging.dart';
 import 'package:path/path.dart' as p;
-import 'package:dwds/src/loaders/strategy.dart';
 
 /// A provider of metadata in which data is collected through DDC outputs.
 class MetadataProvider {

diff --git a/dwds/lib/src/loaders/legacy.dart b/dwds/lib/src/loaders/legacy.dart
@@ -66,10 +66,18 @@ class LegacyStrategy extends LoadStrategy {
   /// an app URI.
   final String? Function(String appUri) _serverPathForAppUri;
 
-  final Uri? _appEntrypoint;
-
+  /// Returns the absolute path to the app's package config, determined by the
+  /// app's [entrypoint] path.
+  ///
+  /// Example:
+  ///
+  ///  main_module.bootstrap.js
+  ///   -> /Users/john_doe/my_dart_app/.dart_tool/package_config.json
+  ///
   final String? Function(String entrypoint) _packageConfigLocator;
 
+  final Uri? _appEntrypoint;
+
   LegacyStrategy(
     this.reloadConfiguration,
     this._moduleForServerPath,

diff --git a/dwds/lib/src/loaders/strategy.dart b/dwds/lib/src/loaders/strategy.dart
@@ -5,8 +5,8 @@
 import 'package:dwds/src/debugging/metadata/provider.dart';
 import 'package:dwds/src/readers/asset_reader.dart';
 import 'package:dwds/src/services/expression_compiler.dart';
-import 'package:shelf/shelf.dart';
 import 'package:dwds/src/utilities/globals.dart';
+import 'package:shelf/shelf.dart';
 
 late LoadStrategy _globalLoadStrategy;
 
@@ -109,7 +109,8 @@ abstract class LoadStrategy {
   ///
   /// Example:
   ///
-  ///  TODO ADD ENTRYPOINT -> /Users/john_doe/my_dart_app/.dart_tool/package_config.json
+  ///  main_module.bootstrap.js
+  ///   -> /Users/john_doe/my_dart_app/.dart_tool/package_config.json
   ///
   String? packageConfigPath(String entrypoint);
 

diff --git a/dwds/lib/src/utilities/dart_uri.dart b/dwds/lib/src/utilities/dart_uri.dart
@@ -3,10 +3,10 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:dwds/src/loaders/strategy.dart';
+import 'package:dwds/src/utilities/globals.dart';
 import 'package:logging/logging.dart';
 import 'package:package_config/package_config.dart';
 import 'package:path/path.dart' as p;
-import 'package:dwds/src/utilities/globals.dart';
 
 /// The URI for a particular Dart file, able to canonicalize from various
 /// different representations.

diff --git a/dwds/lib/src/utilities/globals.dart b/dwds/lib/src/utilities/globals.dart
@@ -1,3 +1,7 @@
+// Copyright (c) 2023, the Dart project authors. Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
 /// The path to the package config.
 String? get packageConfigPath => _packageConfigPath;
 String? _packageConfigPath;

diff --git a/fixtures/_experimentSound/web/main.dart b/fixtures/_experimentSound/web/main.dart
@@ -67,7 +67,7 @@ String testPattern(Object obj) {
 }
 
 String testPattern2() {
-  final dog = 'Prismo'; 
+  final dog = 'Prismo';
   final cats = ['Garfield', 'Tom']; // Breakpoint: testPattern2Case1
   final [firstCat, secondCat] = cats;
   print(firstCat); // Breakpoint: testPattern2Case2