Merge pull request #1067 from scheglov/latestAnalyzer-NamedType

Require analyzer 2.6.0, use NamedType.

Author: scheglov

CHANGELOG.md

@@ -1,4 +1,6 @@
 # 2.2.1-dev
+* Require `package:analyzer` version `2.6.0`.
+* Use `NamedType` instead of `TypeName`.
 
 # 2.2.0
 

lib/src/source_visitor.dart

@@ -801,7 +801,7 @@ class SourceVisitor extends ThrowingAstVisitor {
       token(node.equals);
       space();
 
-      visit(node.superclass);
+      visit(node.superclass2);
 
       builder.startRule(CombinatorRule());
       visit(node.withClause);
@@ -1067,7 +1067,7 @@ class SourceVisitor extends ThrowingAstVisitor {
 
   @override
   void visitConstructorName(ConstructorName node) {
-    visit(node.type);
+    visit(node.type2);
     token(node.period);
     visit(node.name);
   }
@@ -1449,7 +1449,7 @@ class SourceVisitor extends ThrowingAstVisitor {
     soloSplit();
     token(node.extendsKeyword);
     space();
-    visit(node.superclass);
+    visit(node.superclass2);
   }
 
   @override
@@ -2075,7 +2075,7 @@ class SourceVisitor extends ThrowingAstVisitor {
 
   @override
   void visitImplementsClause(ImplementsClause node) {
-    _visitCombinator(node.implementsKeyword, node.interfaces);
+    _visitCombinator(node.implementsKeyword, node.interfaces2);
   }
 
   @override
@@ -2340,18 +2340,18 @@ class SourceVisitor extends ThrowingAstVisitor {
     // If there is only a single superclass constraint, format it like an
     // "extends" in a class.
     var onClause = node.onClause;
-    if (onClause != null && onClause.superclassConstraints.length == 1) {
+    if (onClause != null && onClause.superclassConstraints2.length == 1) {
       soloSplit();
       token(onClause.onKeyword);
       space();
-      visit(onClause.superclassConstraints.single);
+      visit(onClause.superclassConstraints2.single);
     }
 
     builder.startRule(CombinatorRule());
 
     // If there are multiple superclass constraints, format them like the
     // "implements" clause.
-    if (onClause != null && onClause.superclassConstraints.length > 1) {
+    if (onClause != null && onClause.superclassConstraints2.length > 1) {
       visit(onClause);
     }
 
@@ -2371,6 +2371,13 @@ class SourceVisitor extends ThrowingAstVisitor {
     visitNamedArgument(node);
   }
 
+  @override
+  void visitNamedType(NamedType node) {
+    visit(node.name);
+    visit(node.typeArguments);
+    token(node.question);
+  }
+
   @override
   void visitNativeClause(NativeClause node) {
     token(node.nativeKeyword);
@@ -2395,7 +2402,7 @@ class SourceVisitor extends ThrowingAstVisitor {
 
   @override
   void visitOnClause(OnClause node) {
-    _visitCombinator(node.onKeyword, node.superclassConstraints);
+    _visitCombinator(node.onKeyword, node.superclassConstraints2);
   }
 
   @override
@@ -2699,13 +2706,6 @@ class SourceVisitor extends ThrowingAstVisitor {
     _visitGenericList(node.leftBracket, node.rightBracket, node.arguments);
   }
 
-  @override
-  void visitTypeName(TypeName node) {
-    visit(node.name);
-    visit(node.typeArguments);
-    token(node.question);
-  }
-
   @override
   void visitTypeParameter(TypeParameter node) {
     visitParameterMetadata(node.metadata, () {
@@ -2806,7 +2806,7 @@ class SourceVisitor extends ThrowingAstVisitor {
 
   @override
   void visitWithClause(WithClause node) {
-    _visitCombinator(node.withKeyword, node.mixinTypes);
+    _visitCombinator(node.withKeyword, node.mixinTypes2);
   }
 
   @override

pubspec.lock

@@ -7,14 +7,14 @@ packages:
       name: _fe_analyzer_shared
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "26.0.0"
+    version: "29.0.0"
   analyzer:
     dependency: "direct main"
     description:
       name: analyzer
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.3.0"
+    version: "2.6.0"
   args:
     dependency: "direct main"
     description:
@@ -366,4 +366,4 @@ packages:
     source: hosted
     version: "3.1.0"
 sdks:
-  dart: ">=2.12.0 <3.0.0"
+  dart: ">=2.14.0 <3.0.0"

pubspec.yaml

@@ -10,7 +10,7 @@ environment:
   sdk: '>=2.12.0-0 <3.0.0'
 
 dependencies:
-  analyzer: '>=2.0.0 <3.0.0'
+  analyzer: '>=2.6.0 <3.0.0'
   args: '>=1.0.0 <3.0.0'
   path: ^1.0.0
   pub_semver: '>=1.4.4 <3.0.0'