Squash post-merge commits (#2432)

Author: jcollins-g

lib/src/dartdoc_options.dart

@@ -1405,19 +1405,21 @@ class DartdocOptionContext extends DartdocOptionContextBase
   /// Build a DartdocOptionContext from an analyzer element (using its source
   /// location).
   factory DartdocOptionContext.fromElement(DartdocOptionSet optionSet,
-      Element element, ResourceProvider resourceProvider) {
-    return DartdocOptionContext(optionSet,
-        resourceProvider.getFile(element.source.fullName), resourceProvider);
+      LibraryElement libraryElement, ResourceProvider resourceProvider) {
+    return DartdocOptionContext(
+        optionSet,
+        resourceProvider.getFile(libraryElement.source.fullName),
+        resourceProvider);
   }
 
   /// Build a DartdocOptionContext from an existing [DartdocOptionContext] and a
   /// new analyzer [Element].
   factory DartdocOptionContext.fromContextElement(
       DartdocOptionContext optionContext,
-      Element element,
+      LibraryElement libraryElement,
       ResourceProvider resourceProvider) {
     return DartdocOptionContext.fromElement(
-        optionContext.optionSet, element, resourceProvider);
+        optionContext.optionSet, libraryElement, resourceProvider);
   }
 
   /// Build a DartdocOptionContext from an existing [DartdocOptionContext].

lib/src/model/category.dart

@@ -181,17 +181,6 @@ class Category extends Nameable
     return _documentationFile;
   }
 
-  @override
-  void warn(PackageWarning kind,
-      {String message,
-      Iterable<Locatable> referredFrom,
-      Iterable<String> extendedDebug}) {
-    packageGraph.warnOnElement(this, kind,
-        message: message,
-        referredFrom: referredFrom,
-        extendedDebug: extendedDebug);
-  }
-
   @override
   Iterable<Class> get classes => _classes;
 

lib/src/model/model_element.dart

@@ -508,7 +508,7 @@ abstract class ModelElement extends Canonicalization
   @override
   DartdocOptionContext get config {
     _config ??= DartdocOptionContext.fromContextElement(
-        packageGraph.config, element, packageGraph.resourceProvider);
+        packageGraph.config, library.element, packageGraph.resourceProvider);
     return _config;
   }
 
@@ -1105,17 +1105,6 @@ abstract class ModelElement extends Canonicalization
     return _parameters;
   }
 
-  @override
-  void warn(PackageWarning kind,
-      {String message,
-      Iterable<Locatable> referredFrom,
-      Iterable<String> extendedDebug}) {
-    packageGraph.warnOnElement(this, kind,
-        message: message,
-        referredFrom: referredFrom,
-        extendedDebug: extendedDebug);
-  }
-
   @override
   String computeDocumentationComment() => element.documentationComment;
 

lib/src/model/package.dart

@@ -369,17 +369,6 @@ class Package extends LibraryContainer
 
   String get version => packageMeta.version ?? '0.0.0-unknown';
 
-  @override
-  void warn(PackageWarning kind,
-      {String message,
-      Iterable<Locatable> referredFrom,
-      Iterable<String> extendedDebug}) {
-    packageGraph.warnOnElement(this, kind,
-        message: message,
-        referredFrom: referredFrom,
-        extendedDebug: extendedDebug);
-  }
-
   final PackageMeta _packageMeta;
 
   PackageMeta get packageMeta => _packageMeta;

lib/src/warnings.dart

@@ -258,15 +258,22 @@ final Map<PackageWarning, PackageWarningDefinition> packageWarningDefinitions =
 
 /// Something that package warnings can be called on.  Optionally associated
 /// with an analyzer [element].
-abstract class Warnable implements Canonicalization {
-  void warn(PackageWarning warning,
-      {String message, Iterable<Locatable> referredFrom});
-
+mixin Warnable implements Canonicalization {
   Element get element;
 
   Warnable get enclosingElement;
 
   Package get package;
+
+  void warn(PackageWarning kind,
+      {String message,
+      Iterable<Locatable> referredFrom,
+      Iterable<String> extendedDebug}) {
+    packageGraph.warnOnElement(this, kind,
+        message: message,
+        referredFrom: referredFrom,
+        extendedDebug: extendedDebug);
+  }
 }
 
 // The kinds of warnings that can be displayed when documenting a package.