From ad8595bf7edfa7449365328842cb982c3d1831d2 Mon Sep 17 00:00:00 2001 From: David Morgan Date: Wed, 16 Apr 2025 09:56:45 +0200 Subject: [PATCH 1/3] Remove last element1 use. --- source_gen/lib/src/constants/revive.dart | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/source_gen/lib/src/constants/revive.dart b/source_gen/lib/src/constants/revive.dart index 464650b3..0356a46d 100644 --- a/source_gen/lib/src/constants/revive.dart +++ b/source_gen/lib/src/constants/revive.dart @@ -2,9 +2,6 @@ // 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. -// TODO(kevmoo): migrate analyzer APIs when we can get latest with a stable SDK -// ignore_for_file: deprecated_member_use - import 'package:analyzer/dart/constant/value.dart'; import 'package:analyzer/dart/element/element2.dart'; import 'package:analyzer/dart/element/type.dart'; @@ -84,7 +81,7 @@ Revivable reviveInstance(DartObject object, [LibraryElement2? origin]) { url = Uri.parse(urlOfElement(i.constructor2.enclosingElement2)); final result = Revivable._( source: url, - accessor: i.constructor.name, + accessor: i.constructor2.name3!, namedArguments: i.namedArguments, positionalArguments: i.positionalArguments, ); From 7d3624f817b8c9ced034e89f2e19ff5eb52eaa0b Mon Sep 17 00:00:00 2001 From: David Morgan Date: Wed, 16 Apr 2025 10:13:16 +0200 Subject: [PATCH 2/3] Call noname constructor as before. --- source_gen/lib/src/constants/revive.dart | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source_gen/lib/src/constants/revive.dart b/source_gen/lib/src/constants/revive.dart index 0356a46d..dabece9f 100644 --- a/source_gen/lib/src/constants/revive.dart +++ b/source_gen/lib/src/constants/revive.dart @@ -79,9 +79,10 @@ Revivable reviveInstance(DartObject object, [LibraryElement2? origin]) { final i = (object as DartObjectImpl).getInvocation(); if (i != null) { url = Uri.parse(urlOfElement(i.constructor2.enclosingElement2)); + String newToEmpty(String string) => string == 'new' ? '' : string; final result = Revivable._( source: url, - accessor: i.constructor2.name3!, + accessor: newToEmpty(i.constructor2.name3!), namedArguments: i.namedArguments, positionalArguments: i.positionalArguments, ); From 3f7be11d9e45247a2aa8bce130424e526b65f31a Mon Sep 17 00:00:00 2001 From: David Morgan Date: Wed, 16 Apr 2025 17:40:24 +0200 Subject: [PATCH 3/3] Use renamed `build` method. --- source_gen/test/generator_for_annotation_test.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source_gen/test/generator_for_annotation_test.dart b/source_gen/test/generator_for_annotation_test.dart index 598f0280..4ffc6fce 100644 --- a/source_gen/test/generator_for_annotation_test.dart +++ b/source_gen/test/generator_for_annotation_test.dart @@ -317,7 +317,7 @@ class _TestingResolver implements ReleasableResolver { } @override - Future libraryFor2( + Future libraryFor( AssetId assetId, { bool allowSyntaxErrors = false, }) async {