Require analyzer ^13.0.0, with breaking changes. (#1821)

* Require analyzer ^13.0.0, with breaking changes.

* Update comment on writeTokenAssignment()

* Remove unnecessary type arguments.

Author: scheglov

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 3.1.9
+
+* Require `analyzer: ^13.0.0`.
+
 ## 3.1.8
 
 ### Style changes

lib/src/ast_extensions.dart

@@ -12,6 +12,8 @@ extension AstNodeExtensions on AstNode {
   BlockFormat get blockFormatType => switch (this) {
     AdjacentStrings(indentStrings: true) => BlockFormat.indentedAdjacentStrings,
     AdjacentStrings() => BlockFormat.unindentedAdjacentStrings,
+    NamedArgument(:var argumentExpression) =>
+      argumentExpression.blockFormatType,
     Expression(:var blockFormatType) => blockFormatType,
     _ => BlockFormat.none,
   };
@@ -30,9 +32,6 @@ extension AstNodeExtensions on AstNode {
       AnnotatedNode(metadata: [var annotation, ...]) => annotation.beginToken,
       AnnotatedNode(firstTokenAfterCommentAndMetadata: var token) => token,
 
-      // The inner [NormalFormalParameter] is an [AnnotatedNode].
-      DefaultFormalParameter(:var parameter) => parameter.firstNonCommentToken,
-
       // The inner [PatternVariableDeclaration] is an [AnnotatedNode].
       PatternVariableDeclarationStatement(:var declaration) =>
         declaration.firstNonCommentToken,
@@ -214,9 +213,6 @@ extension ExpressionExtensions on Expression {
   /// category it belongs to.
   BlockFormat get blockFormatType {
     return switch (this) {
-      // Unwrap named expressions to get the real expression inside.
-      NamedExpression(:var expression) => expression.blockFormatType,
-
       // Allow the target of a single-section cascade to be block formatted.
       CascadeExpression(:var target, :var cascadeSections)
           when cascadeSections.length == 1 && target.canBlockSplit =>
@@ -276,7 +272,7 @@ extension ExpressionExtensions on Expression {
   /// Whether this is an argument in an argument list with a trailing comma.
   bool get isTrailingCommaArgument {
     var parent = this.parent;
-    if (parent is NamedExpression) parent = parent.parent;
+    if (parent is NamedArgument) parent = parent.parent;
 
     return parent is ArgumentList && parent.arguments.hasCommaAfter;
   }
@@ -479,15 +475,16 @@ extension AdjacentStringsExtensions on AdjacentStrings {
 
       // Don't indent when following `:`.
       MapLiteralEntry(:var value) when value == this => false,
-      NamedExpression() => false,
+      NamedArgument() => false,
+      RecordLiteralNamedField() => false,
 
       // Don't indent when the body of a `=>` function.
       ExpressionFunctionBody() => false,
       _ => true,
     };
   }
 
-  bool _hasOtherStringArgument(List<Expression> arguments) => arguments.any(
+  bool _hasOtherStringArgument(Iterable<Argument> arguments) => arguments.any(
     (argument) => argument != this && argument is StringLiteral,
   );
 }

lib/src/cli/formatter_options.dart

@@ -13,7 +13,7 @@ import 'show.dart';
 import 'summary.dart';
 
 // Note: The following line of code is modified by tool/grind.dart.
-const dartStyleVersion = '3.1.8';
+const dartStyleVersion = '3.1.9';
 
 /// Global options parsed from the command line that affect how the formatter
 /// produces and uses its outputs.

lib/src/front_end/ast_node_visitor.dart

@@ -577,13 +577,6 @@ final class AstNodeVisitor extends ThrowingAstVisitor<void> with PieceFactory {
     writePatternVariable(node.keyword, node.type, node.name);
   }
 
-  @override
-  void visitDefaultFormalParameter(DefaultFormalParameter node) {
-    // Visit the inner parameter. It will then access its parent to extract the
-    // default value.
-    pieces.visit(node.parameter);
-  }
-
   @override
   void visitDoStatement(DoStatement node) {
     pieces.token(node.doKeyword);
@@ -772,7 +765,7 @@ final class AstNodeVisitor extends ThrowingAstVisitor<void> with PieceFactory {
 
   @override
   void visitFieldFormalParameter(FieldFormalParameter node) {
-    if (node.parameters case var parameters?) {
+    if (node.functionTypedSuffix case var functionTypedSuffix?) {
       // A function-typed field formal like:
       //
       //     C(this.fn(parameter));
@@ -781,15 +774,15 @@ final class AstNodeVisitor extends ThrowingAstVisitor<void> with PieceFactory {
         fieldKeyword: node.thisKeyword,
         period: node.period,
         node.name,
-        node.typeParameters,
-        parameters,
-        node.question,
+        functionTypedSuffix.typeParameters,
+        functionTypedSuffix.formalParameters,
+        functionTypedSuffix.question,
         parameter: node,
       );
     } else {
       writeFormalParameter(
         node,
-        mutableKeyword: node.keyword,
+        mutableKeyword: node.constFinalOrVarKeyword,
         fieldKeyword: node.thisKeyword,
         period: node.period,
         node.type,
@@ -802,7 +795,7 @@ final class AstNodeVisitor extends ThrowingAstVisitor<void> with PieceFactory {
   void visitFormalParameterList(FormalParameterList node) {
     // Find the first non-mandatory parameter (if there are any).
     var firstOptional = node.parameters.indexWhere(
-      (p) => p is DefaultFormalParameter,
+      (p) => p.isNamed || p.isOptionalPositional,
     );
 
     // If the parameter list is completely empty, write the brackets inline so
@@ -961,18 +954,6 @@ final class AstNodeVisitor extends ThrowingAstVisitor<void> with PieceFactory {
     });
   }
 
-  @override
-  void visitFunctionTypedFormalParameter(FunctionTypedFormalParameter node) {
-    writeFunctionType(
-      parameter: node,
-      node.returnType,
-      node.name,
-      node.typeParameters,
-      node.parameters,
-      node.question,
-    );
-  }
-
   @override
   void visitGenericFunctionType(GenericFunctionType node) {
     writeFunctionType(
@@ -1290,10 +1271,15 @@ final class AstNodeVisitor extends ThrowingAstVisitor<void> with PieceFactory {
 
   @override
   void visitLabel(Label node) {
-    pieces.visit(node.label);
+    pieces.token(node.name);
     pieces.token(node.colon);
   }
 
+  @override
+  void visitLabelReference(LabelReference node) {
+    pieces.token(node.name);
+  }
+
   @override
   void visitLabeledStatement(LabeledStatement node) {
     var sequence = SequenceBuilder(this);
@@ -1490,11 +1476,11 @@ final class AstNodeVisitor extends ThrowingAstVisitor<void> with PieceFactory {
   }
 
   @override
-  void visitNamedExpression(NamedExpression node) {
-    writeAssignment(
-      node.name.label,
-      node.name.colon,
-      node.expression,
+  void visitNamedArgument(NamedArgument node) {
+    writeTokenAssignment(
+      node.name,
+      node.colon,
+      node.argumentExpression,
       rightHandSideContext: NodeContext.namedExpression,
     );
   }
@@ -1750,6 +1736,16 @@ final class AstNodeVisitor extends ThrowingAstVisitor<void> with PieceFactory {
     );
   }
 
+  @override
+  void visitRecordLiteralNamedField(RecordLiteralNamedField node) {
+    writeTokenAssignment(
+      node.name,
+      node.colon,
+      node.fieldExpression,
+      rightHandSideContext: NodeContext.namedExpression,
+    );
+  }
+
   @override
   void visitRecordPattern(RecordPattern node) {
     writeRecord(node.leftParenthesis, node.fields, node.rightParenthesis);
@@ -1872,13 +1868,24 @@ final class AstNodeVisitor extends ThrowingAstVisitor<void> with PieceFactory {
   }
 
   @override
-  void visitSimpleFormalParameter(SimpleFormalParameter node) {
-    writeFormalParameter(
-      node,
-      node.type,
-      node.name,
-      mutableKeyword: node.keyword,
-    );
+  void visitRegularFormalParameter(RegularFormalParameter node) {
+    if (node.functionTypedSuffix case var functionTypedSuffix?) {
+      writeFunctionType(
+        node.type,
+        node.name!,
+        functionTypedSuffix.typeParameters,
+        functionTypedSuffix.formalParameters,
+        functionTypedSuffix.question,
+        parameter: node,
+      );
+    } else {
+      writeFormalParameter(
+        node,
+        node.type,
+        node.name,
+        mutableKeyword: node.constFinalOrVarKeyword,
+      );
+    }
   }
 
   @override
@@ -1927,7 +1934,7 @@ final class AstNodeVisitor extends ThrowingAstVisitor<void> with PieceFactory {
 
   @override
   void visitSuperFormalParameter(SuperFormalParameter node) {
-    if (node.parameters case var parameters?) {
+    if (node.functionTypedSuffix case var functionTypedSuffix?) {
       // A function-typed super parameter like:
       //
       //     C(super.fn(parameter));
@@ -1936,15 +1943,15 @@ final class AstNodeVisitor extends ThrowingAstVisitor<void> with PieceFactory {
         fieldKeyword: node.superKeyword,
         period: node.period,
         node.name,
-        node.typeParameters,
-        parameters,
-        node.question,
+        functionTypedSuffix.typeParameters,
+        functionTypedSuffix.formalParameters,
+        functionTypedSuffix.question,
         parameter: node,
       );
     } else {
       writeFormalParameter(
         node,
-        mutableKeyword: node.keyword,
+        mutableKeyword: node.constFinalOrVarKeyword,
         fieldKeyword: node.superKeyword,
         period: node.period,
         node.type,

lib/src/front_end/delimited_list_builder.dart

@@ -492,7 +492,7 @@ final class DelimitedListBuilder {
     if (candidateIndex == -1) return;
 
     // The block argument must be positional.
-    if (arguments[candidateIndex] is NamedExpression) return;
+    if (arguments[candidateIndex] is NamedArgument) return;
 
     // Only allow up to one trailing argument after the block argument. This
     // handles the common `tags` and `timeout` named arguments in `test()` and
@@ -514,7 +514,7 @@ final class DelimitedListBuilder {
     //     });
     if (candidateIndex == 1 &&
         arguments[1].blockFormatType == BlockFormat.function &&
-        arguments[0] is! NamedExpression) {
+        arguments[0] is! NamedArgument) {
       var firstArgumentFormatType = arguments[0].blockFormatType;
       if (firstArgumentFormatType
           case BlockFormat.unindentedAdjacentStrings ||

lib/src/front_end/expression_contents.dart

@@ -49,15 +49,15 @@ class ExpressionContents {
   final List<_Contents> _stack = [_Contents(_Type.otherCall)];
 
   /// Begins tracking an argument list.
-  void beginCall(List<AstNode> arguments) {
+  void beginCall(List<Argument> arguments) {
     var type = _Type.otherCall;
 
     // Count the non-trivial named arguments in this call.
     var namedArguments = 0;
     for (var argument in arguments) {
-      if (argument is NamedExpression) {
+      if (argument is NamedArgument) {
         type = _Type.callWithNamedArgument;
-        if (!_isTrivial(argument.expression)) namedArguments++;
+        if (!_isTrivial(argument.argumentExpression)) namedArguments++;
       }
     }
 
@@ -66,7 +66,7 @@ class ExpressionContents {
 
   /// Ends the most recently begun call and returns `true` if its argument list
   /// should eagerly split.
-  bool endCall(List<Expression> arguments) {
+  bool endCall(List<Argument> arguments) {
     var contents = _end();
 
     // If there are "too many" named arguments in this call and the calls it