Require analyzer 6.5.0 and stop using deprecated nodes. (#1490)

* Require analyzer 6.5.0 and stop using deprecated nodes. * Update CHANGELOG.md * Replace SDK 3.0.0 with 3.4.0 in two places.
dart-lang · May 15, 2024 · 93d2068 · 93d2068
1 parent 5ddd749
commit 93d2068
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 28 deletions.
diff --git a/.github/workflows/test-package.yml b/.github/workflows/test-package.yml
@@ -20,7 +20,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        sdk: [3.0.0, dev]
+        sdk: [3.4.0, dev]
     steps:
       - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b
       - uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30
@@ -50,7 +50,7 @@ jobs:
       matrix:
         # Add macos-latest and/or windows-latest if relevant for this package.
         os: [ubuntu-latest]
-        sdk: [3.0.0, dev]
+        sdk: [3.4.0, dev]
     steps:
       - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b
       - uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
 ## 2.3.7-wip
 
 * Remove temporary work around for analyzer 6.2.0 from dart_style 2.3.6.
+* Require `package:analyzer` `>=6.5.0 <7.0.0`.
 
 ## 2.3.6
 

diff --git a/lib/src/front_end/ast_node_visitor.dart b/lib/src/front_end/ast_node_visitor.dart
@@ -594,11 +594,13 @@ class AstNodeVisitor extends ThrowingAstVisitor<void> with PieceFactory {
 
   @override
   void visitExtensionDeclaration(ExtensionDeclaration node) {
+    (Token, TypeAnnotation)? onType;
+    if (node.onClause case var onClause?) {
+      onType = (onClause.onKeyword, onClause.extendedType);
+    }
+
     writeType(node.metadata, [node.extensionKeyword], node.name,
-        typeParameters: node.typeParameters,
-        // TODO(rnystrom): Move to the new analyzer API after Dart 3.4 ships.
-        // ignore: deprecated_member_use
-        onType: (node.onKeyword, node.extendedType), body: () {
+        typeParameters: node.typeParameters, onType: onType, body: () {
       return pieces.build(() {
         writeBody(node.leftBracket, node.members, node.rightBracket);
       });
@@ -1267,6 +1269,12 @@ class AstNodeVisitor extends ThrowingAstVisitor<void> with PieceFactory {
     });
   }
 
+  @override
+  void visitMixinOnClause(MixinOnClause node) {
+    throw UnsupportedError(
+        'This node is handled by PieceFactory.createType().');
+  }
+
   @override
   void visitNamedExpression(NamedExpression node) {
     writeAssignment(node.name.label, node.name.colon, node.expression);
@@ -1332,14 +1340,6 @@ class AstNodeVisitor extends ThrowingAstVisitor<void> with PieceFactory {
     pieces.add(builder.build());
   }
 
-  @override
-  // TODO(rnystrom): Move to the new analyzer API after Dart 3.4 ships.
-  // ignore: deprecated_member_use
-  void visitOnClause(OnClause node) {
-    throw UnsupportedError(
-        'This node is handled by PieceFactory.createType().');
-  }
-
   @override
   void visitParenthesizedExpression(ParenthesizedExpression node) {
     pieces.token(node.leftParenthesis);

diff --git a/lib/src/front_end/piece_factory.dart b/lib/src/front_end/piece_factory.dart
@@ -1171,9 +1171,7 @@ mixin PieceFactory {
       NamedType? superclass,
       RepresentationDeclaration? representation,
       ExtendsClause? extendsClause,
-      // TODO(rnystrom): Move to the new analyzer API after Dart 3.4 ships.
-      // ignore: deprecated_member_use
-      OnClause? onClause,
+      MixinOnClause? onClause,
       WithClause? withClause,
       ImplementsClause? implementsClause,
       NativeClause? nativeClause,

diff --git a/lib/src/short/source_visitor.dart b/lib/src/short/source_visitor.dart
@@ -1274,13 +1274,12 @@ class SourceVisitor extends ThrowingAstVisitor {
     token(node.name, before: space);
 
     visit(node.typeParameters);
-    soloSplit();
-    // TODO(rnystrom): Move to the new analyzer API after Dart 3.4 ships.
-    // ignore: deprecated_member_use
-    token(node.onKeyword);
-    space();
-    // ignore: deprecated_member_use
-    visit(node.extendedType);
+    if (node.onClause case var onClause?) {
+      soloSplit();
+      token(onClause.onKeyword);
+      space();
+      visit(onClause.extendedType);
+    }
     space();
     builder.unnest();
     _visitBody(node.leftBracket, node.members, node.rightBracket);
@@ -2369,9 +2368,7 @@ class SourceVisitor extends ThrowingAstVisitor {
   }
 
   @override
-  // TODO(rnystrom): Move to the new analyzer API after Dart 3.4 ships.
-  // ignore: deprecated_member_use
-  void visitOnClause(OnClause node) {
+  void visitMixinOnClause(MixinOnClause node) {
     _visitCombinator(node.onKeyword, node.superclassConstraints);
   }
 

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -9,7 +9,7 @@ environment:
   sdk: "^3.0.0"
 
 dependencies:
-  analyzer: '^6.3.0'
+  analyzer: '^6.5.0'
   args: ">=1.0.0 <3.0.0"
   collection: "^1.17.0"
   path: ^1.0.0