Version 3.7.0-185.0.dev

Merge 88dc829 into dev
dart-lang · Nov 26, 2024 · bdb76c7 · bdb76c7
2 parents 4b49546 + 88dc829
commit bdb76c7
Show file tree

Hide file tree

Showing 8 changed files with 56 additions and 78 deletions.
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,7 @@
+blank_issues_enabled: true
+contact_links:
+  - name: I want help writing Dart code
+    url: https://stackoverflow.com/tags/dart
+    about: >-
+      Visit Stack Overflow for how-to questions related to using the Dart
+      language, core libraries, or developer tools.
diff --git a/pkg/analyzer/test/src/options/analysis_options_test.dart b/pkg/analyzer/test/src/options/analysis_options_test.dart
@@ -4,7 +4,6 @@
 
 import 'package:analyzer/dart/analysis/analysis_options.dart';
 import 'package:analyzer/error/error.dart';
-import 'package:analyzer/file_system/file_system.dart';
 import 'package:analyzer/file_system/memory_file_system.dart';
 import 'package:analyzer/src/analysis_options/analysis_options_provider.dart';
 import 'package:analyzer/src/dart/analysis/analysis_options.dart';
@@ -24,14 +23,15 @@ main() {
 class AnalysisOptionsTest {
   final AnalysisOptionsProvider optionsProvider = AnalysisOptionsProvider();
 
-  final ResourceProvider resourceProvider = MemoryResourceProvider();
+  final resourceProvider = MemoryResourceProvider();
 
   // TODO(srawlins): Add tests that exercise
   // `optionsProvider.getOptionsFromString` throwing an exception.
   AnalysisOptionsImpl parseOptions(String content) =>
       AnalysisOptionsImpl.fromYaml(
         optionsMap: optionsProvider.getOptionsFromString(content),
-        file: resourceProvider.getFile('/project/analysis_options.yaml'),
+        file: resourceProvider.getFile(resourceProvider.convertPath(
+            '/project/analysis_options.yaml')),
         resourceProvider: resourceProvider,
       );
 
@@ -331,7 +331,7 @@ plugins:
         'toYaml',
         '''
   plugin_one:
-    path: /project/foo/bar
+    path: ${resourceProvider.convertPath('/project/foo/bar')}
 ''',
       ),
     );
@@ -354,7 +354,7 @@ plugins:
         'toYaml',
         '''
   plugin_one:
-    path: /foo/baz
+    path: ${resourceProvider.convertPath('/foo/baz')}
 ''',
       ),
     );

diff --git a/pkg/frontend_server/lib/frontend_server.dart b/pkg/frontend_server/lib/frontend_server.dart
@@ -353,7 +353,7 @@ abstract class CompilerInterface {
       bool isStatic);
 
   /// Compiles [expression] in library [libraryUri] and file [scriptUri]
-  /// at [line]:[column] to JavaScript in [moduleName].
+  /// at [line]:[column] to JavaScript.
   ///
   /// [libraryUri] and [scriptUri] can be the same, but if for instance
   /// evaluating expressions in a part file the [libraryUri] will be the uri of
@@ -368,7 +368,6 @@ abstract class CompilerInterface {
   /// expression.
   ///
   /// Example values of parameters:
-  /// [moduleName] is of the form '/packages/hello_world_main.dart'
   /// [jsFrameValues] is a map from js variable name to its primitive value
   /// or another variable name, for example
   /// { 'x': '1', 'y': 'y', 'o': 'null' }
@@ -383,7 +382,6 @@ abstract class CompilerInterface {
       int column,
       Map<String, String> jsModules,
       Map<String, String> jsFrameValues,
-      String moduleName,
       String expression);
 
   /// Communicates an error [msg] to the client.
@@ -1107,10 +1105,10 @@ class FrontendCompiler implements CompilerInterface {
     }
   }
 
-  /// Program compilers per module.
+  /// Mapping of libraries to their program compiler.
   ///
-  /// Produced during initial compilation of the module to JavaScript,
-  /// cached to be used for expression compilation in [compileExpressionToJs].
+  /// Produced during initial compilation of the component to JavaScript, cached
+  /// to be used for expression compilation in [compileExpressionToJs].
   final Map<String, Compiler> cachedProgramCompilers = {};
 
   @override
@@ -1121,7 +1119,6 @@ class FrontendCompiler implements CompilerInterface {
       int column,
       Map<String, String> jsModules,
       Map<String, String> jsFrameValues,
-      String moduleName,
       String expression) async {
     _generator.accept();
     errors.clear();
@@ -1130,18 +1127,17 @@ class FrontendCompiler implements CompilerInterface {
       reportError('JavaScript bundler is null');
       return;
     }
-    if (!cachedProgramCompilers.containsKey(moduleName)) {
-      reportError('Cannot find kernel2js compiler for $moduleName.');
+    if (!cachedProgramCompilers.containsKey(libraryUri)) {
+      reportError('Cannot find kernel2js compiler for $libraryUri.');
       return;
     }
-
     final String boundaryKey = generateV4UUID();
     _outputStream.writeln('result $boundaryKey');
 
     _processedOptions.ticker
-        .logMs('Compiling expression to JavaScript in $moduleName');
+        .logMs('Compiling expression to JavaScript in $libraryUri');
 
-    final Compiler kernel2jsCompiler = cachedProgramCompilers[moduleName]!;
+    final Compiler kernel2jsCompiler = cachedProgramCompilers[libraryUri]!;
     IncrementalCompilerResult compilerResult = _generator.lastKnownGoodResult!;
     Component component = compilerResult.component;
     component.computeCanonicalNames();
@@ -1370,7 +1366,6 @@ class _CompileExpressionToJsRequest {
   late int column;
   Map<String, String> jsModules = <String, String>{};
   Map<String, String> jsFrameValues = <String, String>{};
-  late String moduleName;
   late String expression;
 }
 
@@ -1594,7 +1589,9 @@ StreamSubscription<String> listenAndCompile(CompilerInterface compiler,
         }
         break;
       case _State.COMPILE_EXPRESSION_TO_JS_MODULENAME:
-        compileExpressionToJsRequest.moduleName = string;
+        // TODO(https://github.com/dart-lang/sdk/issues/58265): `moduleName` is
+        // soft-deprecated, so we still need to consume the string value, but it
+        // is unused.
         state = _State.COMPILE_EXPRESSION_TO_JS_EXPRESSION;
         break;
       case _State.COMPILE_EXPRESSION_TO_JS_EXPRESSION:
@@ -1606,7 +1603,6 @@ StreamSubscription<String> listenAndCompile(CompilerInterface compiler,
             compileExpressionToJsRequest.column,
             compileExpressionToJsRequest.jsModules,
             compileExpressionToJsRequest.jsFrameValues,
-            compileExpressionToJsRequest.moduleName,
             compileExpressionToJsRequest.expression);
         state = _State.READY_FOR_INSTRUCTION;
         break;
@@ -1744,12 +1740,14 @@ Future<void> processJsonInput(
     int column = getValue<int>("column") ?? -1;
     Map<String, String> jsModules = getMap("jsModules") ?? {};
     Map<String, String> jsFrameValues = getMap("jsFrameValues") ?? {};
-    String moduleName = getValue<String>("moduleName") ?? "";
 
     if (errorMessages.isNotEmpty) {
       compiler.reportError("Errors: $errorMessages.");
       return;
     }
+    // TODO(https://github.com/dart-lang/sdk/issues/58265): `moduleName` is
+    // soft-deprecated, and therefore is unused.
+    unusedKeys.remove("moduleName");
     if (unusedKeys.isNotEmpty) {
       compiler.reportError("Errors: Send over unused data: $unusedKeys.");
     }
@@ -1761,7 +1759,6 @@ Future<void> processJsonInput(
       column,
       jsModules,
       jsFrameValues,
-      moduleName,
       expression,
     );
   } else {

diff --git a/pkg/frontend_server/lib/src/javascript_bundle.dart b/pkg/frontend_server/lib/src/javascript_bundle.dart
@@ -179,7 +179,7 @@ class IncrementalJavaScriptBundler {
     int metadataOffset = 0;
     int symbolsOffset = 0;
     final Map<String, Map<String, List<int>>> manifest = {};
-    final Set<Uri> visited = {};
+    final Map<Uri, Compiler> visited = {};
     final Map<String, Compiler> kernel2JsCompilers = {};
 
     for (Library library in _currentComponent.libraries) {
@@ -189,10 +189,10 @@ class IncrementalJavaScriptBundler {
       }
       final Uri moduleUri =
           _strongComponents.moduleAssignment[library.importUri]!;
-      if (visited.contains(moduleUri)) {
+      if (visited.containsKey(moduleUri)) {
+        kernel2JsCompilers[library.importUri.toString()] = visited[moduleUri]!;
         continue;
       }
-      visited.add(moduleUri);
 
       final Component summaryComponent = _uriToComponent[moduleUri]!;
 
@@ -231,7 +231,8 @@ class IncrementalJavaScriptBundler {
       final Program jsModule = compiler.emitModule(summaryComponent);
 
       // Save program compiler to reuse for expression evaluation.
-      kernel2JsCompilers[moduleName] = compiler;
+      kernel2JsCompilers[library.importUri.toString()] = compiler;
+      visited[moduleUri] = compiler;
 
       String? sourceMapBase;
       if (moduleUri.isScheme('package')) {

diff --git a/pkg/frontend_server/test/frontend_server_test.dart b/pkg/frontend_server/test/frontend_server_test.dart
@@ -795,7 +795,6 @@ extension type Foo(int value) {
   }
   ''');
         String library = 'package:hello/foo.dart';
-        String module = 'packages/hello/foo.dart';
 
         File dillFile = new File('${tempDir.path}/foo.dart.dill');
         File sourceFile = new File('${dillFile.path}.sources');
@@ -835,7 +834,6 @@ extension type Foo(int value) {
                 libraryUri: library,
                 line: 5,
                 column: 3,
-                moduleName: module,
                 scriptUri: file.uri,
                 jsFrameValues: {"f": "42"});
             count += 1;
@@ -850,7 +848,6 @@ extension type Foo(int value) {
                 libraryUri: library,
                 line: 11,
                 column: 5,
-                moduleName: module,
                 scriptUri: file.uri,
                 jsFrameValues: {r"$this": "42"});
             count += 1;
@@ -891,7 +888,6 @@ extension type Foo(int value) {
       ];
 
       String library = 'package:hello/foo.dart';
-      String module = 'packages/hello/foo.dart';
 
       FrontendServer frontendServer = new FrontendServer();
       Future<int> result = frontendServer.open(args);
@@ -918,11 +914,7 @@ extension type Foo(int value) {
           expect(outputFile.lengthSync(), isPositive);
 
           frontendServer.compileExpressionToJs(
-              expression: '',
-              libraryUri: library,
-              line: 1,
-              column: 1,
-              moduleName: module);
+              expression: '', libraryUri: library, line: 1, column: 1);
           count += 1;
         } else if (count == 2) {
           // Third request is to 'compile-expression-to-js' that fails
@@ -2818,7 +2810,6 @@ e() {
   ''');
 
         String library = 'package:hello/foo.dart';
-        String module = 'packages/hello/foo.dart';
 
         File dillFile = new File('${tempDir.path}/foo.dart.dill');
         File sourceFile = new File('${dillFile.path}.sources');
@@ -2854,11 +2845,7 @@ e() {
             frontendServer.accept();
 
             frontendServer.compileExpressionToJs(
-                expression: '',
-                libraryUri: library,
-                line: 2,
-                column: 1,
-                moduleName: module);
+                expression: '', libraryUri: library, line: 2, column: 1);
             count += 1;
           } else if (count == 1) {
             // Second request is to 'compile-expression-to-js' that fails
@@ -2869,11 +2856,7 @@ e() {
             });
 
             frontendServer.compileExpressionToJs(
-                expression: '2+2',
-                libraryUri: library,
-                line: 2,
-                column: 1,
-                moduleName: module);
+                expression: '2+2', libraryUri: library, line: 2, column: 1);
             count += 1;
           } else if (count == 2) {
             expect(result.errorsCount, equals(0));
@@ -2933,7 +2916,6 @@ e() {
   ''');
 
         String library = 'package:hello/foo.dart';
-        String module = 'packages/hello/foo.dart';
 
         File dillFile = new File('${tempDir.path}/foo.dart.dill');
         File sourceFile = new File('${dillFile.path}.sources');
@@ -2979,8 +2961,7 @@ e() {
                 expression: 'const bool.fromEnvironment("dart.library.html")',
                 libraryUri: library,
                 line: 2,
-                column: 1,
-                moduleName: module);
+                column: 1);
             count += 1;
           } else {
             expect(count, 1);
@@ -3030,7 +3011,6 @@ e() {
   }
   ''');
         String library = 'package:hello/foo.dart';
-        String module = 'packages/hello/foo.dart';
 
         File dillFile = new File('${tempDir.path}/foo.dart.dill');
         File sourceFile = new File('${dillFile.path}.sources');
@@ -3067,11 +3047,7 @@ e() {
             frontendServer.accept();
 
             frontendServer.compileExpressionToJs(
-                expression: '2+2',
-                libraryUri: library,
-                line: 2,
-                column: 1,
-                moduleName: module);
+                expression: '2+2', libraryUri: library, line: 2, column: 1);
             count += 1;
           } else if (count == 1) {
             expect(result.errorsCount, equals(0));
@@ -3092,11 +3068,7 @@ e() {
             expect(outputFile.lengthSync(), isPositive);
 
             frontendServer.compileExpressionToJs(
-                expression: '2+2',
-                libraryUri: library,
-                line: 2,
-                column: 1,
-                moduleName: module);
+                expression: '2+2', libraryUri: library, line: 2, column: 1);
             count += 1;
           } else if (count == 3) {
             expect(result.errorsCount, equals(0));
@@ -3739,10 +3711,13 @@ class FrontendServer {
       required String libraryUri,
       required int line,
       required int column,
-      required String moduleName,
       Uri? scriptUri,
       Map<String, String>? jsFrameValues,
       String boundaryKey = 'abc'}) {
+    // TODO(https://github.com/dart-lang/sdk/issues/58265): `moduleName` is
+    // soft-deprecated, so even though it's unused, the request should still
+    // contain it so it can be parsed correctly.
+    final String moduleName = 'unused';
     if (useJsonForCommunication) {
       outputParser.expectSources = false;
       inputStreamController.add('JSON_INPUT\n'.codeUnits);

diff --git a/pkg/frontend_server/test/src/javascript_bundle_test.dart b/pkg/frontend_server/test/src/javascript_bundle_test.dart
@@ -215,10 +215,7 @@ void main() {
         expect(code, contains('sourceMappingURL=c.dart.lib.js.map'));
 
         // Verify program compilers are created.
-        final String moduleUrl = javaScriptBundler.urlForComponentUri(
-            library.importUri, packageConfig);
-        final String moduleName = javaScriptBundler.makeModuleName(moduleUrl);
-        expect(compilers.keys, equals([moduleName]));
+        expect(compilers.keys, equals([library.importUri.toString()]));
       });
 
       test('converts package: uris into /packages/ uris', () async {