Rename LibraryFragmentInclude to PartInclude

Also renames associated getters, fixes some comments, and removes a
getter (`nameOffset`) that should have been `nameOffset2`.

Change-Id: I0dc4879c37ec14650d94933c14630176e4d1f57e
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/394386
Reviewed-by: Konstantin Shcheglov <[email protected]>
Commit-Queue: Brian Wilkerson <[email protected]>

Author: bwilkerson

pkg/analysis_server/lib/src/status/ast_writer.dart

@@ -103,7 +103,7 @@ class AstWriter extends UnifyingAstVisitor<void> with TreeWriter {
       properties['static invoke type'] = node.staticInvokeType;
       properties['static type'] = node.staticType;
     } else if (node is PartDirective) {
-      properties['fragment include'] = node.fragmentInclude;
+      properties['fragment include'] = node.partInclude;
     } else if (node is PostfixExpression) {
       properties['element'] = node.element;
       properties['static type'] = node.staticType;

pkg/analyzer/lib/dart/element/element2.dart

@@ -1490,7 +1490,7 @@ abstract class LibraryElement2 implements Element2, Annotatable {
   TypeSystem get typeSystem;
 }
 
-/// An export directive within a library.
+/// An `export` directive within a library fragment.
 ///
 /// Clients may not extend, implement or mix-in this class.
 abstract class LibraryExport {
@@ -1532,11 +1532,6 @@ abstract class LibraryFragment implements Fragment, Annotatable {
   /// The fragments of the extension types declared in this fragment.
   List<ExtensionTypeFragment> get extensionTypes2;
 
-  /// The `part` directives within this fragment.
-  // TODO(brianwilkerson): Rename this, `libraryExports2`, and `libraryImports2`
-  //  to be consistent with each other.
-  List<LibraryFragmentInclude> get fragmentIncludes;
-
   /// The fragments of the top-level functions declared in this fragment.
   List<TopLevelFunctionFragment> get functions2;
 
@@ -1558,6 +1553,9 @@ abstract class LibraryFragment implements Fragment, Annotatable {
   @override
   LibraryFragment? get nextFragment;
 
+  /// The `part` directives within this fragment.
+  List<PartInclude> get partIncludes;
+
   /// The prefixes used by [libraryImports2].
   ///
   /// Each prefix can be used in more than one `import` directive.
@@ -1585,15 +1583,7 @@ abstract class LibraryFragment implements Fragment, Annotatable {
   List<TypeAliasFragment> get typeAliases2;
 }
 
-/// A 'part' directive within a library fragment.
-///
-/// Clients may not extend, implement or mix-in this class.
-abstract class LibraryFragmentInclude {
-  /// The interpretation of the URI specified in the directive.
-  DirectiveUri get uri;
-}
-
-/// An import directive within a library.
+/// An `import` directive within a library fragment.
 ///
 /// Clients may not extend, implement or mix-in this class.
 abstract class LibraryImport {
@@ -1649,12 +1639,6 @@ abstract class LocalFunctionFragment implements ExecutableFragment {
   // @override
   // LocalFunctionElement get element;
 
-  /// The offset of the name of this fragment in the file that contains the
-  /// declaration of this fragment, or `null` if this element doesn't have an
-  /// offset.
-  // TODO(brianwilkerson): Figure out why the return type is nullable.
-  int? get nameOffset;
-
   // TODO(brianwilkerson): This should override `nextFragment` to be more
   //  specific, but can't because the Impl class supports both local and
   //  top-level functions.
@@ -1953,6 +1937,14 @@ abstract class MultiplyDefinedFragment implements Fragment {
   Null get previousFragment;
 }
 
+/// A 'part' directive within a library fragment.
+///
+/// Clients may not extend, implement or mix-in this class.
+abstract class PartInclude {
+  /// The interpretation of the URI specified in the directive.
+  DirectiveUri get uri;
+}
+
 /// A pattern variable.
 ///
 /// Clients may not extend, implement or mix-in this class.
@@ -2132,7 +2124,6 @@ abstract class PropertyInducingFragment
   /// A synthetic fragment is a fragment that is not represented in the source
   /// code explicitly, but is implied by the source code, such as the default
   /// constructor for a class that does not explicitly define any constructors.
-  // TODO(brianwilkerson): Should synthetic elements have a fragment?
   bool get isSynthetic;
 
   @override

pkg/analyzer/lib/src/dart/ast/ast.dart

@@ -13613,7 +13613,7 @@ abstract final class PartDirective implements UriBasedDirective {
   ///
   /// Returns `null` if the AST structure hasn't been resolved.
   @experimental
-  LibraryFragmentInclude? get fragmentInclude;
+  PartInclude? get partInclude;
 
   /// The token representing the `part` keyword.
   Token get partKeyword;
@@ -13661,8 +13661,7 @@ final class PartDirectiveImpl extends UriBasedDirectiveImpl
 
   @experimental
   @override
-  LibraryFragmentInclude? get fragmentInclude =>
-      element as LibraryFragmentInclude?;
+  PartInclude? get partInclude => element as PartInclude?;
 
   @override
   ChildEntities get _childEntities => super._childEntities

pkg/analyzer/lib/src/dart/element/element.dart

@@ -925,10 +925,6 @@ class CompilationUnitElementImpl extends UriReferencedElementImpl
   List<ExtensionTypeFragment> get extensionTypes2 =>
       extensionTypes.cast<ExtensionTypeFragment>();
 
-  @override
-  List<LibraryFragmentInclude> get fragmentIncludes =>
-      libraryImportPrefixes.cast<LibraryFragmentInclude>();
-
   @override
   List<FunctionElementImpl> get functions {
     return _functions;
@@ -1051,6 +1047,10 @@ class CompilationUnitElementImpl extends UriReferencedElementImpl
     return units.elementAtOrNull(index + 1);
   }
 
+  @override
+  List<PartInclude> get partIncludes =>
+      libraryImportPrefixes.cast<PartInclude>();
+
   @override
   List<PartElementImpl> get parts => _parts;
 
@@ -8912,7 +8912,7 @@ mixin ParameterElementMixin implements ParameterElement {
 }
 
 class PartElementImpl extends _ExistingElementImpl
-    implements PartElement, LibraryFragmentInclude {
+    implements PartElement, PartInclude {
   @override
   final DirectiveUri uri;
 

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

@@ -226,7 +226,7 @@ class FindElement2 extends _FindElementBase {
   LibraryFragment part(String targetUri) {
     LibraryFragment? result;
 
-    for (var partElement in libraryFragment.fragmentIncludes) {
+    for (var partElement in libraryFragment.partIncludes) {
       var uri = partElement.uri;
       if (uri is DirectiveUriWithUnit) {
         var unitElement = uri.libraryFragment;