Version 2.19.0-444.0.dev

Merge f28b2d7 into dev

Author: Dart CI

CHANGELOG.md

@@ -171,19 +171,15 @@
 
 #### Analyzer
 
-- add static enforcement of new `mustBeOverridden` annotation
-- add quick fixes for diagnostics:
-  `abstract_field_initializer`,
-  `ambiguous_extension_member_access`,
-  `argument_type_not_assignable`,
-  `assert_in_redirecting_constructor`,
-  `combinators_ordering`,
-  `default_value_on_required_parameter`,
-  `initializing_formal_for_non_existent_field`,
-  `missing_default_value_for_parameter_positional`,
-  `super_formal_parameter_without_associated_named`,
-  `undefined_identifier`
-- add new hints: `cast_from_null_always_fails`, `duplicate_export`
+- add static enforcement of new `mustBeOverridden` annotation, and quick fixes
+- add quick fixes for many diagnostics including compile-time errors, hints, and
+  lints. There are now quick fixes for over 300 diagnostic codes. These lint
+  rules have new fixes: `combinators_ordering`, `dangling_library_doc_comments`,
+  `implicit_call_tearoffs`, `library_annotations`, and
+  `unnecessary_library_directive`.
+- add new hints: `body_might_complete_normally_catch_error`,
+  `cast_from_null_always_fails`, `cast_from_nullable_always_fails`,
+  `deprecated_colon_for_default_value`, and `duplicate_export`
 - remove hint: `invalid_override_different_default_values`
 
 #### Linter

pkg/_fe_analyzer_shared/lib/src/parser/forwarding_listener.dart

@@ -1994,6 +1994,11 @@ class ForwardingListener implements Listener {
         keyword, equals, semicolon);
   }
 
+  @override
+  void handlePatternAssignment(Token equals) {
+    listener?.handlePatternAssignment(equals);
+  }
+
   @override
   void logEvent(String name) {
     listener?.logEvent(name);

pkg/_fe_analyzer_shared/lib/src/parser/listener.dart

@@ -2139,4 +2139,13 @@ class Listener implements UnescapeErrorListener {
       Token keyword, Token equals, Token semicolon) {
     logEvent('PatternVariableDeclarationStatement');
   }
+
+  /// Called after the parser has processed a pattern assignment consisting of
+  /// `PATTERN EQUALS EXPRESSION`.
+  ///
+  /// PATTERN may only be one of the patterns accepted by the `outerPattern`
+  /// grammar rule defined in the patterns spec.
+  void handlePatternAssignment(Token equals) {
+    logEvent("PatternAssignment");
+  }
 }

pkg/_fe_analyzer_shared/lib/src/parser/parser_impl.dart

@@ -5466,10 +5466,14 @@ class Parser {
         listener.handleIdentifier(token, IdentifierContext.expression);
       }
     } else {
-      token = optional('throw', token.next!)
-          ? parseThrowExpression(token, /* allowCascades = */ true)
-          : parsePrecedenceExpression(
-              token, ASSIGNMENT_PRECEDENCE, /* allowCascades = */ true);
+      if (allowPatterns && looksLikeOuterPatternEquals(token)) {
+        token = parsePatternAssignment(token);
+      } else {
+        token = optional('throw', token.next!)
+            ? parseThrowExpression(token, /* allowCascades = */ true)
+            : parsePrecedenceExpression(
+                token, ASSIGNMENT_PRECEDENCE, /* allowCascades = */ true);
+      }
     }
     expressionDepth--;
     return token;
@@ -9796,7 +9800,8 @@ class Parser {
       if (next.isIdentifier) {
         return skipObjectPatternRest(next);
       } else {
-        throw new UnimplementedError('TODO(paulberry)');
+        // IDENTIFIER `.` NON-IDENTIFIER (not a pattern)
+        return null;
       }
     }
     TypeParamOrArgInfo typeParamOrArg = computeTypeParamOrArg(token);
@@ -9847,6 +9852,17 @@ class Parser {
     return semicolon;
   }
 
+  /// patternAssignment ::= outerPattern '=' expression
+  Token parsePatternAssignment(Token token) {
+    token = parsePattern(token, isRefutableContext: false);
+    Token equals = token.next!;
+    // Caller should have assured that the pattern was followed by an `=`.
+    assert(optional('=', equals));
+    token = parseExpression(equals);
+    listener.handlePatternAssignment(equals);
+    return token;
+  }
+
   /// switchExpression    ::= 'switch' '(' expression ')' '{'
   ///                         switchExpressionCase ( ',' switchExpressionCase )*
   ///                             ','? '}'

pkg/analysis_server/lib/src/computer/computer_highlights.dart

@@ -905,6 +905,8 @@ class _DartUnitHighlightsComputerVisitor extends RecursiveAstVisitor<void> {
   void visitFunctionTypedFormalParameter(FunctionTypedFormalParameter node) {
     computer._addRegion_token(
         node.requiredKeyword, HighlightRegionType.KEYWORD);
+    computer._addRegion_token(
+        node.name, HighlightRegionType.PARAMETER_DECLARATION);
     super.visitFunctionTypedFormalParameter(node);
   }
 

pkg/analysis_server/lib/src/services/correction/dart/add_explicit_call.dart

@@ -11,9 +11,18 @@ import 'package:analyzer_plugin/utilities/fixes/fixes.dart';
 import 'package:analyzer_plugin/utilities/range_factory.dart';
 
 class AddExplicitCall extends CorrectionProducer {
+  @override
+  bool get canBeAppliedInBulk => true;
+
+  @override
+  bool get canBeAppliedToFile => true;
+
   @override
   FixKind get fixKind => DartFixKind.ADD_EXPLICIT_CALL;
 
+  @override
+  FixKind get multiFixKind => DartFixKind.ADD_EXPLICIT_CALL_MULTI;
+
   @override
   Future<void> compute(ChangeBuilder builder) async {
     AstNode? current = node;

pkg/analysis_server/lib/src/services/correction/dart/move_doc_comment_to_library_directive.dart

@@ -0,0 +1,127 @@
+// Copyright (c) 2022, the Dart project authors. Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+import 'package:_fe_analyzer_shared/src/scanner/token.dart';
+import 'package:analysis_server/src/services/correction/dart/abstract_producer.dart';
+import 'package:analysis_server/src/services/correction/fix.dart';
+import 'package:analyzer/dart/analysis/features.dart';
+import 'package:analyzer/dart/ast/ast.dart';
+import 'package:analyzer/source/line_info.dart';
+import 'package:analyzer/source/source_range.dart';
+import 'package:analyzer_plugin/utilities/change_builder/change_builder_core.dart';
+import 'package:analyzer_plugin/utilities/fixes/fixes.dart';
+import 'package:analyzer_plugin/utilities/range_factory.dart';
+import 'package:collection/collection.dart';
+
+class MoveDocCommentToLibraryDirective extends CorrectionProducer {
+  @override
+  FixKind get fixKind => DartFixKind.MOVE_DOC_COMMENT_TO_LIBRARY_DIRECTIVE;
+
+  @override
+  Future<void> compute(ChangeBuilder builder) async {
+    var comment = node.thisOrAncestorOfType<Comment>();
+    if (comment == null) {
+      return;
+    }
+    var compilationUnit = comment.root;
+    if (compilationUnit is! CompilationUnit) {
+      return;
+    }
+
+    var firstDirective = compilationUnit.directives.firstOrNull;
+    if (firstDirective is LibraryDirective) {
+      await _moveToExistingLibraryDirective(builder, comment, firstDirective);
+    } else if (libraryElement.featureSet.isEnabled(Feature.unnamedLibraries)) {
+      await _moveToNewLibraryDirective(builder, comment, compilationUnit);
+    }
+
+    // If the library doesn't support unnamed libraries, then we cannot add
+    // a new library directive; we don't know what to name it.
+  }
+
+  Future<void> _moveToExistingLibraryDirective(ChangeBuilder builder,
+      Comment comment, LibraryDirective libraryDirective) async {
+    // Just move the annotation to the existing library directive.
+    var commentRange = utils.getLinesRange(range.node(comment));
+    await builder.addDartFileEdit(file, (builder) {
+      builder.addDeletion(commentRange);
+      var commentText = utils.getRangeText(commentRange);
+      builder.addSimpleInsertion(
+          libraryDirective.firstTokenAfterCommentAndMetadata.offset,
+          commentText);
+    });
+  }
+
+  Future<void> _moveToNewLibraryDirective(ChangeBuilder builder,
+      Comment comment, CompilationUnit compilationUnit) async {
+    var commentRange = _rangeOfFirstBlock(comment, compilationUnit.lineInfo);
+
+    // Create a new, unnamed library directive, and move the comment to just
+    // above the directive.
+    var token = compilationUnit.beginToken;
+
+    if (token.type == TokenType.SCRIPT_TAG) {
+      // TODO(srawlins): Handle this case.
+      return;
+    }
+
+    if (token.precedingComments == comment.beginToken) {
+      // Do not "move" the comment. Just slip a library directive below it.
+      await builder.addDartFileEdit(file, (builder) {
+        builder.addSimpleInsertion(commentRange.end, 'library;$eol');
+      });
+      return;
+    }
+
+    int insertionOffset;
+    String prefix;
+    Token? commentOnFirstToken = token.precedingComments;
+    if (commentOnFirstToken != null) {
+      while (commentOnFirstToken!.next != null) {
+        commentOnFirstToken = commentOnFirstToken.next!;
+
+        if (commentOnFirstToken == comment.beginToken) {
+          // Do not "move" the comment. Just slip a library directive below it.
+          await builder.addDartFileEdit(file, (builder) {
+            builder.addSimpleInsertion(commentRange.end, 'library;$eol$eol');
+          });
+          return;
+        }
+      }
+      // `token` is now the last of the leading comments (perhaps a Copyight
+      // notice, a Dart language version, etc.)
+      insertionOffset = commentOnFirstToken.end;
+      prefix = '$eol$eol';
+    } else {
+      insertionOffset = 0;
+      prefix = '';
+    }
+
+    await builder.addDartFileEdit(file, (builder) {
+      builder.addDeletion(commentRange);
+      var commentText = utils.getRangeText(commentRange);
+      builder.addSimpleInsertion(
+          insertionOffset, '$prefix${commentText}library;$eol$eol');
+    });
+  }
+
+  /// The range of the first "block" in [comment].
+  ///
+  /// A [Comment] can contain blank lines (even an end-of-line comment, and an
+  /// end-of-line doc comment). But for the purpose of this fix, we interpret
+  /// only the first "block" or "paragraph" of text as what was intented to be
+  /// the library comment.
+  SourceRange _rangeOfFirstBlock(Comment comment, LineInfo lineInfo) {
+    for (var token in comment.tokens) {
+      var next = token.next;
+      if (next != null &&
+          lineInfo.getLocation(next.offset).lineNumber >
+              lineInfo.getLocation(token.end).lineNumber + 1) {
+        // There is a blank line. Interpret this as two separate doc comments.
+        return utils.getLinesRange(range.startEnd(comment.tokens.first, token));
+      }
+    }
+    return utils.getLinesRange(range.node(comment));
+  }
+}

pkg/analysis_server/lib/src/services/correction/error_fix_status.yaml

@@ -1819,7 +1819,7 @@ LintCode.control_flow_in_finally:
 LintCode.curly_braces_in_flow_control_structures:
   status: hasFix
 LintCode.dangling_library_doc_comments:
-  status: needsEvaluation
+  status: hasFix
 LintCode.depend_on_referenced_packages:
   status: needsFix
 LintCode.deprecated_consistency:

pkg/analysis_server/lib/src/services/correction/fix.dart

@@ -143,6 +143,11 @@ class DartFixKind {
     DartFixKindPriority.DEFAULT,
     'Add explicit .call tearoff',
   );
+  static const ADD_EXPLICIT_CALL_MULTI = FixKind(
+    'dart.fix.add.explicitCall.multi',
+    DartFixKindPriority.IN_FILE,
+    'Add explicit .call to implicit tearoffs in file',
+  );
   static const ADD_EXPLICIT_CAST = FixKind(
     'dart.fix.add.explicitCast',
     DartFixKindPriority.DEFAULT,
@@ -852,6 +857,11 @@ class DartFixKind {
     DartFixKindPriority.DEFAULT,
     "Move this annotation to a library directive",
   );
+  static const MOVE_DOC_COMMENT_TO_LIBRARY_DIRECTIVE = FixKind(
+    'dart.fix.moveDocCommentToLibraryDirective',
+    DartFixKindPriority.DEFAULT,
+    "Move this doc comment to a library directive",
+  );
   static const ORGANIZE_IMPORTS = FixKind(
     'dart.fix.organize.imports',
     DartFixKindPriority.DEFAULT,

pkg/analysis_server/lib/src/services/correction/fix_internal.dart

@@ -107,6 +107,7 @@ import 'package:analysis_server/src/services/correction/dart/make_return_type_nu
 import 'package:analysis_server/src/services/correction/dart/make_variable_not_final.dart';
 import 'package:analysis_server/src/services/correction/dart/make_variable_nullable.dart';
 import 'package:analysis_server/src/services/correction/dart/move_annotation_to_library_directive.dart';
+import 'package:analysis_server/src/services/correction/dart/move_doc_comment_to_library_directive.dart';
 import 'package:analysis_server/src/services/correction/dart/move_type_arguments_to_class.dart';
 import 'package:analysis_server/src/services/correction/dart/organize_imports.dart';
 import 'package:analysis_server/src/services/correction/dart/qualify_reference.dart';
@@ -461,6 +462,9 @@ class FixProcessor extends BaseProcessor {
     LintNames.curly_braces_in_flow_control_structures: [
       UseCurlyBraces.new,
     ],
+    LintNames.dangling_library_doc_comments: [
+      MoveDocCommentToLibraryDirective.new,
+    ],
     LintNames.diagnostic_describe_all_properties: [
       AddDiagnosticPropertyReference.new,
     ],

pkg/analysis_server/lib/src/services/linter/lint_names.dart

@@ -53,6 +53,8 @@ class LintNames {
   static const String combinators_ordering = 'combinators_ordering';
   static const String curly_braces_in_flow_control_structures =
       'curly_braces_in_flow_control_structures';
+  static const String dangling_library_doc_comments =
+      'dangling_library_doc_comments';
   static const String diagnostic_describe_all_properties =
       'diagnostic_describe_all_properties';
   static const String directives_ordering = 'directives_ordering';