Version 2.18.0-29.0.dev

Merge commit '909dbe509dc81eda7553662b26a02dbd55e46362' into 'dev'

Author: Dart CI

pkg/analyzer/lib/src/error/codes.g.dart

@@ -9475,16 +9475,15 @@ class CompileTimeErrorCode extends AnalyzerErrorCode {
   );
 
   /**
-   * Technically this is [IMPLEMENTS_SUPER_CLASS].
-   * See https://github.com/dart-lang/sdk/issues/25765#issuecomment-307422593
-   *
    * Parameters:
    * 0: the name of the class that appears in both "extends" and "with" clauses
    */
   static const CompileTimeErrorCode MIXINS_SUPER_CLASS = CompileTimeErrorCode(
-    'MIXINS_SUPER_CLASS',
+    'IMPLEMENTS_SUPER_CLASS',
     "'{0}' can't be used in both 'extends' and 'with' clauses.",
     correctionMessage: "Try removing one of the occurrences.",
+    hasPublishedDocs: true,
+    uniqueName: 'MIXINS_SUPER_CLASS',
   );
 
   /**

pkg/analyzer/messages.yaml

@@ -8297,12 +8297,11 @@ CompileTimeErrorCode:
       }
       ```
   MIXINS_SUPER_CLASS:
+    sharedName: IMPLEMENTS_SUPER_CLASS
     problemMessage: "'{0}' can't be used in both 'extends' and 'with' clauses."
     correctionMessage: Try removing one of the occurrences.
+    hasPublishedDocs: true
     comment: |-
-      Technically this is [IMPLEMENTS_SUPER_CLASS].
-      See https://github.com/dart-lang/sdk/issues/25765#issuecomment-307422593
-
       Parameters:
       0: the name of the class that appears in both "extends" and "with" clauses
   MIXIN_APPLICATION_CONCRETE_SUPER_INVOKED_MEMBER_TYPE:

pkg/analyzer/tool/diagnostics/diagnostics.md

@@ -6731,6 +6731,8 @@ class B implements A {}
 
 ### implements_super_class
 
+_'{0}' can't be used in both 'extends' and 'with' clauses._
+
 _'{0}' can't be used in both the 'extends' and 'implements' clauses._
 
 #### Description

tools/VERSION

@@ -27,5 +27,5 @@ CHANNEL dev
 MAJOR 2
 MINOR 18
 PATCH 0
-PRERELEASE 28
+PRERELEASE 29
 PRERELEASE_PATCH 0