Parts. Resolve PartDirective configurations.

Change-Id: I499a1f971ac30b919e7aede267779151495b235c
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/380141
Reviewed-by: Phil Quitslund <[email protected]>
Commit-Queue: Konstantin Shcheglov <[email protected]>

Author: scheglov

pkg/analyzer/lib/src/dart/analysis/file_state.dart

@@ -494,25 +494,29 @@ abstract class FileKind {
           return PartIncludeWithFile(
             container: this,
             unlinked: unlinked,
-            uri: selectedUri,
+            selectedUri: selectedUri,
+            uris: uris,
           );
         case DirectiveUriWithUri():
           return PartIncludeWithUri(
             container: this,
             unlinked: unlinked,
-            uri: selectedUri,
+            selectedUri: selectedUri,
+            uris: uris,
           );
         case DirectiveUriWithString():
           return PartIncludeWithUriStr(
             container: this,
             unlinked: unlinked,
-            uri: selectedUri,
+            selectedUri: selectedUri,
+            uris: uris,
           );
         case DirectiveUriWithoutString():
           return PartIncludeState(
             container: this,
             unlinked: unlinked,
-            uri: selectedUri,
+            selectedUri: selectedUri,
+            uris: uris,
           );
       }
     }).toFixedList();
@@ -2515,12 +2519,14 @@ sealed class PartFileKind extends FileKind {
 /// Information about a single `part` directive.
 final class PartIncludeState<U extends DirectiveUri> extends DirectiveState {
   final UnlinkedPartDirective unlinked;
-  final U uri;
+  final U selectedUri;
+  final DirectiveUris uris;
 
   PartIncludeState({
     required super.container,
     required this.unlinked,
-    required this.uri,
+    required this.selectedUri,
+    required this.uris,
   });
 }
 
@@ -2530,12 +2536,13 @@ final class PartIncludeWithFile
   PartIncludeWithFile({
     required super.container,
     required super.unlinked,
-    required super.uri,
+    required super.selectedUri,
+    required super.uris,
   }) {
     includedFile.referencingFiles.add(container.file);
   }
 
-  FileState get includedFile => uri.file;
+  FileState get includedFile => selectedUri.file;
 
   /// If [includedFile] is a [PartFileKind], and it confirms that it
   /// is a part of the [container], returns the [includedFile].
@@ -2559,7 +2566,8 @@ final class PartIncludeWithUri<U extends DirectiveUriWithUri>
   PartIncludeWithUri({
     required super.container,
     required super.unlinked,
-    required super.uri,
+    required super.selectedUri,
+    required super.uris,
   });
 }
 
@@ -2569,7 +2577,8 @@ final class PartIncludeWithUriStr<U extends DirectiveUriWithString>
   PartIncludeWithUriStr({
     required super.container,
     required super.unlinked,
-    required super.uri,
+    required super.selectedUri,
+    required super.uris,
   });
 }
 

pkg/analyzer/lib/src/dart/analysis/library_analyzer.dart

@@ -3,6 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:analyzer/dart/analysis/declared_variables.dart';
+import 'package:analyzer/dart/analysis/features.dart';
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/error/error.dart';
 import 'package:analyzer/error/listener.dart';
@@ -968,7 +969,7 @@ class LibraryAnalyzer {
     required LibraryImportState state,
     required ErrorReporter errorReporter,
   }) {
-    _resolveNamespaceDirective(
+    _resolveUriConfigurations(
       configurationNodes: directive.configurations,
       configurationUris: state.uris.configurations,
     );
@@ -986,7 +987,7 @@ class LibraryAnalyzer {
     required ErrorReporter errorReporter,
   }) {
     directive.element = element;
-    _resolveNamespaceDirective(
+    _resolveUriConfigurations(
       configurationNodes: directive.configurations,
       configurationUris: state.uris.configurations,
     );
@@ -1041,7 +1042,7 @@ class LibraryAnalyzer {
   }) {
     directive.element = element;
     directive.prefix?.staticElement = element.prefix?.element;
-    _resolveNamespaceDirective(
+    _resolveUriConfigurations(
       configurationNodes: directive.configurations,
       configurationUris: state.uris.configurations,
     );
@@ -1052,16 +1053,6 @@ class LibraryAnalyzer {
     );
   }
 
-  void _resolveNamespaceDirective({
-    required List<Configuration> configurationNodes,
-    required List<file_state.DirectiveUri> configurationUris,
-  }) {
-    for (var i = 0; i < configurationNodes.length; i++) {
-      var node = configurationNodes[i] as ConfigurationImpl;
-      node.resolvedUri = configurationUris[i].asDirectiveUri;
-    }
-  }
-
   void _resolvePartDirective({
     required FileAnalysis enclosingFile,
     required PartDirectiveImpl directive,
@@ -1085,7 +1076,7 @@ class LibraryAnalyzer {
       errorReporter.atNode(
         directive.uri,
         CompileTimeErrorCode.INVALID_URI,
-        arguments: [partState.uri.relativeUriStr],
+        arguments: [partState.selectedUri.relativeUriStr],
       );
       return;
     }
@@ -1094,7 +1085,7 @@ class LibraryAnalyzer {
       errorReporter.atNode(
         directive.uri,
         CompileTimeErrorCode.URI_DOES_NOT_EXIST,
-        arguments: [partState.uri.relativeUriStr],
+        arguments: [partState.selectedUri.relativeUriStr],
       );
       return;
     }
@@ -1135,20 +1126,22 @@ class LibraryAnalyzer {
     if (partElementUri is! DirectiveUriWithUnitImpl) {
       switch (includedKind) {
         case PartOfNameFileKind():
-          var name = includedKind.unlinked.name;
-          var libraryName = _libraryElement.name;
-          if (libraryName.isEmpty) {
-            errorReporter.atNode(
-              partUri,
-              CompileTimeErrorCode.PART_OF_UNNAMED_LIBRARY,
-              arguments: [name],
-            );
-          } else {
-            errorReporter.atNode(
-              partUri,
-              CompileTimeErrorCode.PART_OF_DIFFERENT_LIBRARY,
-              arguments: [libraryName, name],
-            );
+          if (!_libraryElement.featureSet.isEnabled(Feature.enhanced_parts)) {
+            var name = includedKind.unlinked.name;
+            var libraryName = _libraryElement.name;
+            if (libraryName.isEmpty) {
+              errorReporter.atNode(
+                partUri,
+                CompileTimeErrorCode.PART_OF_UNNAMED_LIBRARY,
+                arguments: [name],
+              );
+            } else {
+              errorReporter.atNode(
+                partUri,
+                CompileTimeErrorCode.PART_OF_DIFFERENT_LIBRARY,
+                arguments: [libraryName, name],
+              );
+            }
           }
         case PartOfUriFileKind():
           errorReporter.atNode(
@@ -1163,12 +1156,27 @@ class LibraryAnalyzer {
       return;
     }
 
+    _resolveUriConfigurations(
+      configurationNodes: directive.configurations,
+      configurationUris: partState.uris.configurations,
+    );
+
     _resolveDirectives(
       enclosingFile: enclosingFile,
       fileKind: includedKind,
       fileElement: partElementUri.unit,
     );
   }
+
+  void _resolveUriConfigurations({
+    required List<ConfigurationImpl> configurationNodes,
+    required List<file_state.DirectiveUri> configurationUris,
+  }) {
+    for (var i = 0; i < configurationNodes.length; i++) {
+      var node = configurationNodes[i];
+      node.resolvedUri = configurationUris[i].asDirectiveUri;
+    }
+  }
 }
 
 /// Analysis result for single file.

pkg/analyzer/lib/src/summary2/library_builder.dart

@@ -1320,19 +1320,19 @@ class LibraryBuilder with MacroApplicationsContainer {
           );
 
           directiveUri = DirectiveUriWithUnitImpl(
-            relativeUriString: state.uri.relativeUriStr,
-            relativeUri: state.uri.relativeUri,
+            relativeUriString: state.selectedUri.relativeUriStr,
+            relativeUri: state.selectedUri.relativeUri,
             unit: unitElement,
           );
         } else {
           directiveUri = DirectiveUriWithSourceImpl(
-            relativeUriString: state.uri.relativeUriStr,
-            relativeUri: state.uri.relativeUri,
+            relativeUriString: state.selectedUri.relativeUriStr,
+            relativeUri: state.selectedUri.relativeUri,
             source: state.includedFile.source,
           );
         }
       default:
-        var uriState = state.uri;
+        var uriState = state.selectedUri;
         switch (uriState) {
           case file_state.DirectiveUriWithSource():
             directiveUri = DirectiveUriWithSourceImpl(

pkg/analyzer/lib/src/test_utilities/find_node.dart

@@ -55,6 +55,8 @@ class FindNode {
 
   ConditionalExpression get singleConditionalExpression => _single();
 
+  Configuration get singleConfiguration => _single();
+
   ConstructorDeclaration get singleConstructorDeclaration => _single();
 
   ConstructorFieldInitializer get singleConstructorFieldInitializer =>

pkg/analyzer/messages.yaml

@@ -13293,6 +13293,7 @@ CompileTimeErrorCode:
       code:
 
       ```dart
+      %language=3.4
       %uri="lib/part_file.dart"
       part of lib;
       ```
@@ -13302,6 +13303,7 @@ CompileTimeErrorCode:
       name to specify which library it's a part of:
 
       ```dart
+      %language=3.4
       part [!'part_file.dart'!];
       ```
 
@@ -13311,6 +13313,7 @@ CompileTimeErrorCode:
       by URI:
 
       ```dart
+      %language=3.4
       %uri="lib/part_file.dart"
       part of 'test.dart';
       ```

pkg/analyzer/test/src/dart/analysis/analyzer_state_printer.dart

@@ -661,7 +661,7 @@ class AnalyzerStatePrinter {
               }
             });
           case PartIncludeWithUri():
-            var uriStr = _stringOfUriStr(part.uri.relativeUriStr);
+            var uriStr = _stringOfUriStr(part.selectedUri.relativeUriStr);
             sink.writelnWithIndent('uri: $uriStr');
           default:
             sink.writelnWithIndent('noUri');

pkg/analyzer/test/src/dart/analysis/file_state_test.dart

@@ -3220,6 +3220,35 @@ elementFactory
 ''');
   }
 
+  test_newFile_library_parts_invalidUri_noSource() {
+    var a = newFile('$testPackageLibPath/a.dart', r'''
+part 'foo:bar';
+''');
+
+    fileStateFor(a);
+
+    assertDriverStateString(testFile, r'''
+files
+  /home/test/lib/a.dart
+    uri: package:test/a.dart
+    current
+      id: file_0
+      kind: library_0
+        libraryImports
+          library_1 dart:core synthetic
+        partIncludes
+          uri: foo:bar
+        fileKinds: library_0
+        cycle_0
+          dependencies: dart:core
+          libraries: library_0
+          apiSignature_0
+      unlinkedKey: k00
+libraryCycles
+elementFactory
+''');
+  }
+
   test_newFile_library_parts_ofUri_two() {
     var a = newFile('$testPackageLibPath/a.dart', r'''
 part of 'c.dart';