Version 2.19.0-227.0.dev

Merge 46bc947 into dev

pkg/analyzer/lib/dart/analysis/code_style_options.dart

@@ -2,6 +2,8 @@
 // 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:analyzer/dart/ast/ast.dart';
+
 /// A set of options related to coding style that apply to the code within a
 /// single analysis context.
 ///
@@ -14,6 +16,10 @@ abstract class CodeStyleOptions {
   /// Return `true` if local variables should be `final` whenever possible.
   bool get makeLocalsFinal;
 
+  /// Return the preferred quote based on the enabled lints,otherwise a single
+  /// quote.
+  String get preferredQuoteForStrings;
+
   /// Return `true` if constructors should be sorted first, before other
   /// class members.
   bool get sortConstructorsFirst;
@@ -25,4 +31,8 @@ abstract class CodeStyleOptions {
   /// Return `true` if URIs should be "relative", meaning without a scheme,
   /// whenever possible.
   bool get useRelativeUris;
+
+  /// Return the preferred quote based on the enabled lints, otherwise based
+  /// on the first directive, otherwise a single quote.
+  String preferredQuoteForUris(List<ImportDirective> directives);
 }

pkg/analyzer/lib/src/analysis_options/code_style_options.dart

@@ -4,6 +4,8 @@
 
 import 'package:analyzer/dart/analysis/analysis_options.dart';
 import 'package:analyzer/dart/analysis/code_style_options.dart';
+import 'package:analyzer/dart/ast/ast.dart';
+import 'package:collection/collection.dart';
 
 /// The concrete implementation of [CodeStyleOptions].
 class CodeStyleOptionsImpl implements CodeStyleOptions {
@@ -22,12 +24,34 @@ class CodeStyleOptionsImpl implements CodeStyleOptions {
   @override
   bool get makeLocalsFinal => _isLintEnabled('prefer_final_locals');
 
+  @override
+  String get preferredQuoteForStrings => _lintQuote() ?? "'";
+
   @override
   bool get sortConstructorsFirst => _isLintEnabled('sort_constructors_first');
 
   @override
   bool get useRelativeUris => _isLintEnabled('prefer_relative_imports');
 
+  @override
+  String preferredQuoteForUris(List<ImportDirective> directives) {
+    var lintQuote = _lintQuote();
+    if (lintQuote != null) {
+      return lintQuote;
+    }
+    var uri = directives.firstOrNull?.uri;
+    var doubleQuote = uri is SimpleStringLiteral &&
+        uri.literal.value().toString().startsWith('"');
+    return doubleQuote ? '"' : "'";
+  }
+
   /// Return `true` if the lint with the given [name] is enabled.
   bool _isLintEnabled(String name) => options.isLintEnabled(name);
+
+  /// Return the preferred lint quote, otherwise `null`.
+  String? _lintQuote() => _isLintEnabled("prefer_single_quotes")
+      ? "'"
+      : _isLintEnabled("prefer_double_quotes")
+          ? '"'
+          : null;
 }

pkg/analyzer/lib/src/dart/ast/ast.dart

@@ -8833,31 +8833,26 @@ abstract class NamespaceDirectiveImpl extends UriBasedDirectiveImpl
 ///    nativeClause ::=
 ///        'native' [StringLiteral]
 class NativeClauseImpl extends AstNodeImpl implements NativeClause {
-  /// The token representing the 'native' keyword.
   @override
-  Token nativeKeyword;
+  final Token nativeKeyword;
 
-  /// The name of the native object that implements the class.
-  StringLiteralImpl? _name;
+  @override
+  final StringLiteralImpl? name;
 
   /// Initialize a newly created native clause.
-  NativeClauseImpl(this.nativeKeyword, this._name) {
-    _becomeParentOf(_name);
+  NativeClauseImpl({
+    required this.nativeKeyword,
+    required this.name,
+  }) {
+    _becomeParentOf(name);
   }
 
   @override
   Token get beginToken => nativeKeyword;
 
   @override
   Token get endToken {
-    return _name?.endToken ?? nativeKeyword;
-  }
-
-  @override
-  StringLiteralImpl? get name => _name;
-
-  set name(StringLiteral? name) {
-    _name = _becomeParentOf(name as StringLiteralImpl?);
+    return name?.endToken ?? nativeKeyword;
   }
 
   @override
@@ -8870,7 +8865,7 @@ class NativeClauseImpl extends AstNodeImpl implements NativeClause {
 
   @override
   void visitChildren(AstVisitor visitor) {
-    _name?.accept(visitor);
+    name?.accept(visitor);
   }
 }
 
@@ -9154,10 +9149,12 @@ abstract class NormalFormalParameterImpl extends FormalParameterImpl
 class NullLiteralImpl extends LiteralImpl implements NullLiteral {
   /// The token representing the literal.
   @override
-  Token literal;
+  final Token literal;
 
   /// Initialize a newly created null literal.
-  NullLiteralImpl(this.literal);
+  NullLiteralImpl({
+    required this.literal,
+  });
 
   @override
   Token get beginToken => literal;
@@ -9216,13 +9213,16 @@ mixin NullShortableExpressionImpl implements NullShortableExpression {
 ///        'on' [TypeName] (',' [TypeName])*
 class OnClauseImpl extends AstNodeImpl implements OnClause {
   @override
-  Token onKeyword;
+  final Token onKeyword;
 
   /// The classes are super-class constraints for the mixin.
   final NodeListImpl<NamedType> _superclassConstraints = NodeListImpl._();
 
   /// Initialize a newly created on clause.
-  OnClauseImpl(this.onKeyword, List<NamedType> superclassConstraints) {
+  OnClauseImpl({
+    required this.onKeyword,
+    required List<NamedType> superclassConstraints,
+  }) {
     _superclassConstraints._initialize(this, superclassConstraints);
   }
 

pkg/analyzer/lib/src/dart/ast/ast_factory.dart

@@ -183,9 +183,6 @@ class AstFactoryImpl {
         rightBracket);
   }
 
-  NativeClauseImpl nativeClause(Token nativeKeyword, StringLiteral? name) =>
-      NativeClauseImpl(nativeKeyword, name as StringLiteralImpl?);
-
   NativeFunctionBodyImpl nativeFunctionBody(
           Token nativeKeyword, StringLiteral? stringLiteral, Token semicolon) =>
       NativeFunctionBodyImpl(
@@ -194,12 +191,6 @@ class AstFactoryImpl {
   NodeListImpl<E> nodeList<E extends AstNode>(AstNode owner) =>
       NodeListImpl<E>(owner as AstNodeImpl);
 
-  NullLiteralImpl nullLiteral(Token literal) => NullLiteralImpl(literal);
-
-  OnClauseImpl onClause(
-          Token onKeyword, List<NamedType> superclassConstraints) =>
-      OnClauseImpl(onKeyword, superclassConstraints);
-
   ParenthesizedExpressionImpl parenthesizedExpression(Token leftParenthesis,
           Expression expression, Token rightParenthesis) =>
       ParenthesizedExpressionImpl(

pkg/analyzer/lib/src/dart/ast/utilities.dart

@@ -2904,15 +2904,6 @@ class NodeReplacer extends ThrowingAstVisitor<bool> {
     return visitUriBasedDirective(node);
   }
 
-  @override
-  bool visitNativeClause(covariant NativeClauseImpl node) {
-    if (identical(node.name, _oldNode)) {
-      node.name = _newNode as StringLiteral;
-      return true;
-    }
-    return visitNode(node);
-  }
-
   @override
   bool visitNativeFunctionBody(covariant NativeFunctionBodyImpl node) {
     if (identical(node.stringLiteral, _oldNode)) {

pkg/analyzer/lib/src/dart/constant/potentially_constant.dart

@@ -102,6 +102,10 @@ class _Collector {
       return;
     }
 
+    if (node is RecordLiteral) {
+      return _recordLiteral(node);
+    }
+
     if (node is MethodInvocation) {
       return _methodInvocation(node);
     }
@@ -309,6 +313,12 @@ class _Collector {
     nodes.add(node);
   }
 
+  void _recordLiteral(RecordLiteral node) {
+    for (final field in node.fields) {
+      collect(field);
+    }
+  }
+
   void _typeArgumentList(TypeArgumentList? typeArgumentList) {
     var typeArguments = typeArgumentList?.arguments;
     if (typeArguments != null) {

pkg/analyzer/lib/src/fasta/ast_builder.dart

@@ -104,7 +104,7 @@ class AstBuilder extends StackListener {
   // * The current library has an import that uses the scheme "dart-ext".
   bool allowNativeClause = false;
 
-  StringLiteral? nativeName;
+  StringLiteralImpl? nativeName;
 
   bool parseFunctionBodies = true;
 
@@ -3247,7 +3247,10 @@ class AstBuilder extends StackListener {
 
     NativeClauseImpl? nativeClause;
     if (nativeToken != null) {
-      nativeClause = ast.nativeClause(nativeToken, nativeName);
+      nativeClause = NativeClauseImpl(
+        nativeKeyword: nativeToken,
+        name: nativeName,
+      );
     }
     var implementsClause =
         pop(NullValue.IdentifierList) as ImplementsClauseImpl?;
@@ -4039,7 +4042,11 @@ class AstBuilder extends StackListener {
     assert(optional('null', token));
     debugEvent("LiteralNull");
 
-    push(ast.nullLiteral(token));
+    push(
+      NullLiteralImpl(
+        literal: token,
+      ),
+    );
   }
 
   @override
@@ -4103,7 +4110,12 @@ class AstBuilder extends StackListener {
       final onTypes = _popNamedTypeList(
         errorCode: ParserErrorCode.EXPECTED_NAMED_TYPE_ON,
       );
-      push(ast.onClause(onKeyword, onTypes));
+      push(
+        OnClauseImpl(
+          onKeyword: onKeyword,
+          superclassConstraints: onTypes,
+        ),
+      );
     } else {
       push(NullValue.IdentifierList);
     }
@@ -4144,7 +4156,7 @@ class AstBuilder extends StackListener {
     debugEvent("NativeClause");
 
     if (hasName) {
-      nativeName = pop() as StringLiteral; // StringLiteral
+      nativeName = pop() as StringLiteralImpl;
     } else {
       nativeName = null;
     }
@@ -4390,8 +4402,8 @@ class AstBuilder extends StackListener {
         builder.onClause = onClause;
       } else {
         builder.onClause = OnClauseImpl(
-          existingClause.onKeyword,
-          [
+          onKeyword: existingClause.onKeyword,
+          superclassConstraints: [
             ...existingClause.superclassConstraints,
             ...onClause.superclassConstraints,
           ],

pkg/analyzer/lib/src/generated/testing/ast_test_factory.dart

@@ -463,19 +463,12 @@ class AstTestFactory {
         ),
       );
 
-  static NativeClauseImpl nativeClause(String nativeCode) =>
-      astFactory.nativeClause(
-          TokenFactory.tokenFromString("native"), string2(nativeCode));
-
   static NativeFunctionBodyImpl nativeFunctionBody(String nativeMethodName) =>
       astFactory.nativeFunctionBody(
           TokenFactory.tokenFromString("native"),
           string2(nativeMethodName),
           TokenFactory.tokenFromType(TokenType.SEMICOLON));
 
-  static NullLiteralImpl nullLiteral() =>
-      astFactory.nullLiteral(TokenFactory.tokenFromKeyword(Keyword.NULL));
-
   static ParenthesizedExpressionImpl parenthesizedExpression(
           Expression expression) =>
       astFactory.parenthesizedExpression(

pkg/analyzer/lib/src/summary2/ast_binary_reader.dart

@@ -902,8 +902,8 @@ class AstBinaryReader {
   }
 
   NullLiteral _readNullLiteral() {
-    var node = astFactory.nullLiteral(
-      Tokens.null_(),
+    final node = NullLiteralImpl(
+      literal: Tokens.null_(),
     );
     _readExpressionResolution(node);
     return node;