From 54c8892bce5b878770ce700988c888e8f3f34c47 Mon Sep 17 00:00:00 2001 From: Keerti Parthasarathy Date: Mon, 10 Feb 2025 04:26:18 -0800 Subject: [PATCH 1/2] Elements. Migrate to Element2 --- lib/src/model/extension.dart | 10 +++++----- test/end2end/model_test.dart | 2 -- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/lib/src/model/extension.dart b/lib/src/model/extension.dart index b8bf241a25..5bb758ba49 100644 --- a/lib/src/model/extension.dart +++ b/lib/src/model/extension.dart @@ -2,13 +2,13 @@ // 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. -// ignore_for_file: analyzer_use_new_elements - import 'package:analyzer/dart/element/element2.dart'; import 'package:analyzer/dart/element/nullability_suffix.dart'; import 'package:analyzer/dart/element/type.dart'; // ignore: implementation_imports -import 'package:analyzer/src/utilities/extensions/element.dart'; +import 'package:analyzer/src/dart/element/element.dart'; +// ignore: implementation_imports +import 'package:analyzer/src/dart/element/type_system.dart'; import 'package:dartdoc/src/element_type.dart'; import 'package:dartdoc/src/model/comment_referable.dart'; import 'package:dartdoc/src/model/kind.dart'; @@ -52,8 +52,8 @@ class Extension extends Container { extendedType = library.element2.typeSystem.promoteToNonNull(extendedType); var otherType = container.modelType.type; if (otherType is InterfaceType) { - otherType = library.element2.typeSystem.instantiateInterfaceToBounds( - element: otherType.element3.asElement, + otherType = (library.element2.typeSystem as TypeSystemImpl).instantiateInterfaceToBounds2( + element: otherType.element3 as InterfaceElementImpl2, nullabilitySuffix: NullabilitySuffix.none, ); diff --git a/test/end2end/model_test.dart b/test/end2end/model_test.dart index 9729e5dae5..923ef0b406 100644 --- a/test/end2end/model_test.dart +++ b/test/end2end/model_test.dart @@ -4,8 +4,6 @@ // ignore_for_file: non_constant_identifier_names - // ignore_for_file: analyzer_use_new_elements - import 'package:analyzer/dart/element/element2.dart'; import 'package:analyzer/dart/element/type.dart'; import 'package:analyzer/source/line_info.dart'; From 8e59eabeba1503a4545553bcc92cbf7be2545f38 Mon Sep 17 00:00:00 2001 From: Keerti Parthasarathy Date: Mon, 10 Feb 2025 05:29:11 -0800 Subject: [PATCH 2/2] Revert extension.dart --- lib/src/model/extension.dart | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/src/model/extension.dart b/lib/src/model/extension.dart index 5bb758ba49..b8bf241a25 100644 --- a/lib/src/model/extension.dart +++ b/lib/src/model/extension.dart @@ -2,13 +2,13 @@ // 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. +// ignore_for_file: analyzer_use_new_elements + import 'package:analyzer/dart/element/element2.dart'; import 'package:analyzer/dart/element/nullability_suffix.dart'; import 'package:analyzer/dart/element/type.dart'; // ignore: implementation_imports -import 'package:analyzer/src/dart/element/element.dart'; -// ignore: implementation_imports -import 'package:analyzer/src/dart/element/type_system.dart'; +import 'package:analyzer/src/utilities/extensions/element.dart'; import 'package:dartdoc/src/element_type.dart'; import 'package:dartdoc/src/model/comment_referable.dart'; import 'package:dartdoc/src/model/kind.dart'; @@ -52,8 +52,8 @@ class Extension extends Container { extendedType = library.element2.typeSystem.promoteToNonNull(extendedType); var otherType = container.modelType.type; if (otherType is InterfaceType) { - otherType = (library.element2.typeSystem as TypeSystemImpl).instantiateInterfaceToBounds2( - element: otherType.element3 as InterfaceElementImpl2, + otherType = library.element2.typeSystem.instantiateInterfaceToBounds( + element: otherType.element3.asElement, nullabilitySuffix: NullabilitySuffix.none, );