Cleanup package_graph migration (#2869)

Author: parlough

lib/src/generator/templates.runtime_renderers.dart

@@ -16641,44 +16641,44 @@ const _invisibleGetters = {
     'specialClasses',
     'allImplementorsAdded',
     'allExtensionsAdded',
+    'documentedExtensions',
     'allLibraries',
     'allConstructedModelElements',
     'allInheritableElements',
     'packageMeta',
     'config',
     'rendererFactory',
     'packageMetaProvider',
+    'defaultPackage',
     'hasEmbedderSdk',
     'packageMap',
     'sdk',
+    'sdkLibrarySources',
     'allLibrariesAdded',
     'packageWarningCounter',
+    'publicPackages',
+    'publicLibraries',
+    'localLibraries',
     'localPublicLibraries',
+    'inheritThrough',
+    'invisibleAnnotations',
+    'allModelElements',
+    'allLocalModelElements',
+    'allCanonicalModelElements',
+    'referenceChildren',
     'name',
     'implementors',
-    'documentedExtensions',
     'extensions',
     'defaultPackageName',
-    'defaultPackage',
     'hasFooterVersion',
     'packageGraph',
     'resourceProvider',
-    'sdkLibrarySources',
     'packages',
-    'publicPackages',
     'localPackages',
     'documentedPackages',
     'libraryElementReexportedBy',
     'allHrefs',
     'libraries',
-    'publicLibraries',
-    'localLibraries',
-    'inheritThrough',
-    'invisibleAnnotations',
-    'allModelElements',
-    'allLocalModelElements',
-    'allCanonicalModelElements',
-    'referenceChildren',
     'referenceParents'
   },
   'PackageMeta': {

lib/src/model/accessor.dart

@@ -90,7 +90,7 @@ class Accessor extends ModelElement implements EnclosedElement {
   /// for a synthetic accessor just in case it is inherited somewhere
   /// down the line due to split inheritance.
   bool get _hasSyntheticDocumentationComment =>
-      (isGetter || definingCombo.hasNodoc! || _comboDocsAreIndependent()) &&
+      (isGetter || definingCombo.hasNodoc || _comboDocsAreIndependent()) &&
       definingCombo.hasDocumentationComment;
 
   // If we're a setter, and a getter exists, do not add synthetic

lib/src/model/documentation_comment.dart

@@ -83,7 +83,7 @@ mixin DocumentationComment
   bool get hasDocumentationComment;
 
   /// Returns true if the raw documentation comment has a nodoc indication.
-  bool? get hasNodoc {
+  bool get hasNodoc {
     if (hasDocumentationComment &&
         (documentationComment.contains('@nodoc') ||
             documentationComment.contains('<nodoc>'))) {

lib/src/model/extension_target.dart

@@ -21,7 +21,7 @@ mixin ExtensionTarget on ModelElement {
   /// defined by [element] can exist where this extension applies, not including
   /// any extension that applies to every type.
   Iterable<Extension>? get potentiallyApplicableExtensions {
-    _potentiallyApplicableExtensions ??= packageGraph.documentedExtensions!
+    _potentiallyApplicableExtensions ??= packageGraph.documentedExtensions
         .where((e) => !e.alwaysApplies)
         .where((e) => e.couldApplyTo(this))
         .toList(growable: false);

lib/src/model/inheritable.dart

@@ -70,9 +70,9 @@ mixin Inheritable on ContainerMember {
       for (var c in inheritance.reversed) {
         // Filter out mixins.
         if (c!.containsElement(searchElement)) {
-          if ((packageGraph.inheritThrough!.contains(previous) &&
+          if ((packageGraph.inheritThrough.contains(previous) &&
                   c != definingEnclosingContainer) ||
-              (packageGraph.inheritThrough!.contains(c) &&
+              (packageGraph.inheritThrough.contains(c) &&
                   c == definingEnclosingContainer)) {
             return previousNonSkippable!
                 .memberByExample(this)
@@ -90,7 +90,7 @@ mixin Inheritable on ContainerMember {
           }
         }
         previous = c;
-        if (!packageGraph.inheritThrough!.contains(c)) {
+        if (!packageGraph.inheritThrough.contains(c)) {
           previousNonSkippable = c;
         }
       }

lib/src/model/library.dart

@@ -184,8 +184,8 @@ class Library extends ModelElement with Categorization, TopLevelContainer {
       .toList(growable: false);
 
   SdkLibrary? get sdkLib {
-    if (packageGraph.sdkLibrarySources!.containsKey(element.librarySource)) {
-      return packageGraph.sdkLibrarySources![element.librarySource];
+    if (packageGraph.sdkLibrarySources.containsKey(element.librarySource)) {
+      return packageGraph.sdkLibrarySources[element.librarySource];
     }
     return null;
   }

lib/src/model/model_element.dart

@@ -404,7 +404,7 @@ abstract class ModelElement extends Canonicalization
 
   @override
   late final bool isPublic = () {
-    if (name == '') {
+    if (name.isEmpty) {
       return false;
     }
     if (this is! Library && (library == null || !library!.isPublic)) {
@@ -417,7 +417,7 @@ abstract class ModelElement extends Canonicalization
         !(enclosingElement as Extension).isPublic) {
       return false;
     }
-    return utils.hasPublicName(element!) && !hasNodoc!;
+    return utils.hasPublicName(element!) && !hasNodoc;
   }();
 
   @override
@@ -543,7 +543,7 @@ abstract class ModelElement extends Canonicalization
       if (this is Inheritable && !config.linkToRemote) {
         if ((this as Inheritable).isInherited &&
             _canonicalLibrary == null &&
-            packageGraph.publicLibraries!.contains(library)) {
+            packageGraph.publicLibraries.contains(library)) {
           // In the event we've inherited a field from an object that isn't
           // directly reexported, we may need to pretend we are canonical for
           // this.
@@ -553,7 +553,7 @@ abstract class ModelElement extends Canonicalization
       _canonicalLibraryIsSet = true;
     }
     assert(_canonicalLibrary == null ||
-        packageGraph.publicLibraries!.contains(_canonicalLibrary));
+        packageGraph.publicLibraries.contains(_canonicalLibrary));
     return _canonicalLibrary;
   }