Version 2.18.0-94.0.dev

Merge commit '2d1dc8523aabb11960d596968819b519aa9d326d' into 'dev'

Author: Dart CI

.github/workflows/scorecards-analysis.yml

@@ -0,0 +1,54 @@
+name: Scorecards supply-chain security
+on:
+  # Only the default branch is supported.
+  branch_protection_rule:
+  schedule:
+    # “At 00:00 (UTC) daily.”
+    - cron: '0 0 * * *'
+
+# Declare default permissions as read only.
+permissions: read-all
+
+jobs:
+  analysis:
+    name: Scorecards analysis
+    runs-on: ubuntu-latest
+    permissions:
+      # Needed to upload the results to code-scanning dashboard.
+      security-events: write
+      actions: read
+      contents: read
+
+    steps:
+      - name: "Checkout code"
+        uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846 # v3.0.0
+        with:
+          persist-credentials: false
+
+      - name: "Run analysis"
+        uses: ossf/scorecard-action@c1aec4ac820532bab364f02a81873c555a0ba3a1 # v1.0.4
+        with:
+          results_file: results.sarif
+          results_format: sarif
+          # Read-only PAT token. To create it,
+          # follow the steps in https://github.com/ossf/scorecard-action#pat-token-creation.
+          repo_token: ${{ secrets.SCORECARD_READ_TOKEN }}
+          # Publish the results to enable scorecard badges. For more details, see
+          # https://github.com/ossf/scorecard-action#publishing-results.
+          # For private repositories, `publish_results` will automatically be set to `false`,
+          # regardless of the value entered here.
+          publish_results: true
+
+      # Upload the results as artifacts (optional).
+      - name: "Upload artifact"
+        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535 # v3.0.0
+        with:
+          name: SARIF file
+          path: results.sarif
+          retention-days: 5
+
+      # Upload the results to GitHub's code scanning dashboard.
+      - name: "Upload to code-scanning"
+        uses: github/codeql-action/upload-sarif@5f532563584d71fdef14ee64d17bafb34f751ce5 # v1.0.26
+        with:
+          sarif_file: results.sarif

CHANGELOG.md

@@ -274,9 +274,23 @@ them, you must set the lower bound on the SDK constraint for your package to
 
 #### Linter
 
-Updated the Linter to `1.22.0`, which includes changes that
-
-- fixes null-safe variance exceptions in `invariant_booleans`
+Updated the Linter to `1.23.0`, which includes changes that
+
+- fixes `no_leading_underscores_for_local_identifiers`
+  to lint local function declarations.
+- fixes `avoid_init_to_null` to correctly handle super
+  initializing defaults that are non-null.
+- updates `no_leading_underscores_for_local_identifiers`
+  to allow identifiers with just underscores.
+- fixes `flutter_style_todos` to support usernames that
+  start with a digit.
+- updates `require_trailing_commas` to handle functions
+  in asserts and multi-line strings.
+- updates `unsafe_html` to allow assignments to 
+  `img.src`.
+- fixes `unnecessary_null_checks` to properly handle map
+  literal entries.
+- fixes null-safe variance exceptions in `invariant_booleans`.
 - updates `depend_on_referenced_packages` to treat `flutter_gen` as a virtual
   package, not needing an explicit dependency.
 - updates `unnecessary_null_checks` and

DEPS

@@ -122,7 +122,7 @@ vars = {
   "intl_rev": "9669926609e7efc17dfd74fbb44ec719a7e573cc",
   "jinja2_rev": "2222b31554f03e62600cd7e383376a7c187967a1",
   "json_rpc_2_rev": "7e00f893440a72de0637970325e4ea44bd1e8c8e",
-  "linter_rev": "14c916a16e78315e212cf79e7ccf4c19159a1bda",
+  "linter_rev": "4305b933c8ed0275f26a99bd1ade39fe9130e6a5", # 1.23.0
   "lints_rev": "8294e5648ab49474541527e2911e72e4c5aefe55",
   "logging_rev": "dfbe88b890c3b4f7bc06da5a7b3b43e9e263b688",
   "markdown_rev": "7479783f0493f6717e1d7ae31cb37d39a91026b2",
@@ -170,8 +170,8 @@ vars = {
   "webdev_rev": "8c814f9d89915418d8abe354ff9befec8f2906b2",
   "webdriver_rev": "ff5ccb1522edf4bed578ead4d65e0cbc1f2c4f02",
   "webkit_inspection_protocol_rev": "dd6fb5d8b536e19cedb384d0bbf1f5631923f1e8",
-  "yaml_edit_rev": "4fadb43801b07f90b3f0c6065dbce4efc6d8d55e",
-  "yaml_rev": "ad0779d1baa25c6b10a192d080efc45de02b6a32",
+  "yaml_edit_rev": "0b74d85fac10b4fbf7d1a347debcf16c8f7b0e9c",
+  "yaml_rev": "0971c06490b9670add644ed62182acd6a5536946",
   "zlib_rev": "faff052b6b6edcd6dd548513fe44ac0941427bf0",
 
   # Windows deps

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

@@ -30,6 +30,10 @@ class AddTrailingComma extends CorrectionProducer {
       await _insertComma(builder, node.parameters.last);
     } else if (node is Assertion) {
       await _insertComma(builder, node.message ?? node.condition);
+    } else if (node is ListLiteral) {
+      await _insertComma(builder, node.elements.last);
+    } else if (node is SetOrMapLiteral) {
+      await _insertComma(builder, node.elements.last);
     }
   }
 

pkg/analysis_server/test/src/services/correction/fix/add_trailing_comma_test.dart

@@ -102,6 +102,50 @@ void f(a, b) {
 ''');
   }
 
+  @failingTest
+  Future<void> test_list_literal() async {
+    await resolveTestCode('''
+void f() {
+  var l = [
+    'a',
+    'b'
+  ];
+  print(l);
+}
+''');
+    await assertHasFix('''
+void f() {
+  var l = [
+    'a',
+    'b',
+  ];
+  print(l);
+}
+''');
+  }
+
+  @failingTest
+  Future<void> test_map_literal() async {
+    await resolveTestCode('''
+void f() {
+  var l = {
+    'a': 1,
+    'b': 2
+  };
+  print(l);
+}
+''');
+    await assertHasFix('''
+void f() {
+  var l = {
+    'a': 1,
+    'b': 2,
+  };
+  print(l);
+}
+''');
+  }
+
   Future<void> test_named() async {
     await resolveTestCode('''
 void f({a, b}) {
@@ -140,6 +184,28 @@ void f(a, b) {
   f('a',
     'b',);
 }
+''');
+  }
+
+  @failingTest
+  Future<void> test_set_literal() async {
+    await resolveTestCode('''
+void f() {
+  var l = {
+    'a',
+    'b'
+  };
+  print(l);
+}
+''');
+    await assertHasFix('''
+void f() {
+  var l = {
+    'a',
+    'b',
+  };
+  print(l);
+}
 ''');
   }
 }

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

@@ -10,11 +10,14 @@ import 'package:_fe_analyzer_shared/src/macros/executor/multi_executor.dart';
 import 'package:_fe_analyzer_shared/src/macros/executor/protocol.dart' as macro;
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/ast/token.dart';
+import 'package:analyzer/dart/element/nullability_suffix.dart';
 import 'package:analyzer/dart/element/type.dart';
 import 'package:analyzer/dart/element/visitor.dart';
 import 'package:analyzer/src/dart/element/element.dart';
+import 'package:analyzer/src/dart/element/type_system.dart';
 import 'package:analyzer/src/summary2/library_builder.dart';
 import 'package:analyzer/src/summary2/link.dart';
+import 'package:analyzer/src/summary2/linked_element_factory.dart';
 import 'package:analyzer/src/summary2/macro_application_error.dart';
 import 'package:analyzer/src/summary2/macro_declarations.dart';
 
@@ -25,9 +28,12 @@ class LibraryMacroApplier {
 
   final List<_MacroTarget> _targets = [];
 
-  final macro.IdentifierResolver _identifierResolver = _IdentifierResolver();
+  late final macro.IdentifierResolver _identifierResolver =
+      _IdentifierResolver(_linker.elementFactory, declarationBuilder);
 
-  final macro.TypeResolver _typeResolver = _TypeResolver();
+  late final macro.TypeResolver _typeResolver = _TypeResolver(
+    typeSystem: libraryBuilder.element.typeSystem,
+  );
 
   late final macro.ClassIntrospector _classIntrospector =
       _ClassIntrospector(declarationBuilder);
@@ -451,9 +457,13 @@ class _ClassIntrospector implements macro.ClassIntrospector {
   }
 
   @override
-  Future<List<macro.FieldDeclaration>> fieldsOf(macro.ClassDeclaration clazz) {
-    // TODO: implement fieldsOf
-    throw UnimplementedError();
+  Future<List<macro.FieldDeclaration>> fieldsOf(
+    covariant ClassDeclarationImpl clazz,
+  ) async {
+    return clazz.element.fields
+        .where((e) => !e.isSynthetic)
+        .map(declarationBuilder.fromElement.fieldElement)
+        .toList();
   }
 
   @override
@@ -493,10 +503,19 @@ class _ClassIntrospector implements macro.ClassIntrospector {
 }
 
 class _IdentifierResolver extends macro.IdentifierResolver {
+  final LinkedElementFactory elementFactory;
+  final DeclarationBuilder declarationBuilder;
+
+  _IdentifierResolver(
+    this.elementFactory,
+    this.declarationBuilder,
+  );
+
   @override
-  Future<macro.Identifier> resolveIdentifier(Uri library, String name) {
-    // TODO: implement resolveIdentifier
-    throw UnimplementedError();
+  Future<macro.Identifier> resolveIdentifier(Uri library, String name) async {
+    final libraryElement = elementFactory.libraryOfUri2(library.toString());
+    final element = libraryElement.scope.lookup(name).getter!;
+    return declarationBuilder.fromElement.identifier(element);
   }
 }
 
@@ -571,12 +590,61 @@ class _MacroTargetElementCollector extends GeneralizingElementVisitor<void> {
   }
 }
 
-class _TypeResolver implements macro.TypeResolver {
+class _StaticTypeImpl extends macro.StaticType {
+  final TypeSystemImpl typeSystem;
+  final DartType type;
+
+  _StaticTypeImpl(this.typeSystem, this.type);
+
   @override
-  Future<macro.StaticType> resolve(macro.TypeAnnotationCode type) {
-    // TODO: implement resolve
+  Future<bool> isExactly(_StaticTypeImpl other) {
+    // TODO: implement isExactly
     throw UnimplementedError();
   }
+
+  @override
+  Future<bool> isSubtypeOf(_StaticTypeImpl other) {
+    // TODO(scheglov) write tests
+    return Future.value(
+      typeSystem.isSubtypeOf(type, other.type),
+    );
+  }
+}
+
+class _TypeResolver implements macro.TypeResolver {
+  final TypeSystemImpl typeSystem;
+
+  _TypeResolver({
+    required this.typeSystem,
+  });
+
+  @override
+  Future<macro.StaticType> resolve(macro.TypeAnnotationCode type) async {
+    var dartType = _resolve(type);
+    return _StaticTypeImpl(typeSystem, dartType);
+  }
+
+  DartType _resolve(macro.TypeAnnotationCode type) {
+    // TODO(scheglov) write tests
+    if (type is macro.NamedTypeAnnotationCode) {
+      final identifier = type.name as IdentifierImpl;
+      final element = identifier.element;
+      if (element is ClassElementImpl) {
+        return element.instantiate(
+          typeArguments: type.typeArguments.map(_resolve).toList(),
+          nullabilitySuffix: type.isNullable
+              ? NullabilitySuffix.question
+              : NullabilitySuffix.none,
+        );
+      } else {
+        // TODO(scheglov) Implement other elements.
+        throw UnimplementedError('(${element.runtimeType}) $element');
+      }
+    } else {
+      // TODO(scheglov) Implement other types.
+      throw UnimplementedError('(${type.runtimeType}) $type');
+    }
+  }
 }
 
 extension on macro.MacroExecutionResult {