Index: pkg/analyzer/lib/src/dart/ast/utilities.dart |
diff --git a/pkg/analyzer/lib/src/dart/ast/utilities.dart b/pkg/analyzer/lib/src/dart/ast/utilities.dart |
index 7dd0e48010e4b202c1072313332910fcccab9273..3efd68b24894e652a1fd46e77a69644023dec045 100644 |
--- a/pkg/analyzer/lib/src/dart/ast/utilities.dart |
+++ b/pkg/analyzer/lib/src/dart/ast/utilities.dart |
@@ -7,6 +7,7 @@ library analyzer.src.dart.ast.utilities; |
import 'dart:collection'; |
import 'package:analyzer/dart/ast/ast.dart'; |
+import 'package:analyzer/dart/ast/standard_ast_factory.dart'; |
import 'package:analyzer/dart/ast/token.dart'; |
import 'package:analyzer/dart/ast/visitor.dart'; |
import 'package:analyzer/dart/element/element.dart'; |
@@ -120,10 +121,10 @@ class AstCloner implements AstVisitor<AstNode> { |
@override |
AdjacentStrings visitAdjacentStrings(AdjacentStrings node) => |
- new AdjacentStrings(cloneNodeList(node.strings)); |
+ astFactory.adjacentStrings(cloneNodeList(node.strings)); |
@override |
- Annotation visitAnnotation(Annotation node) => new Annotation( |
+ Annotation visitAnnotation(Annotation node) => astFactory.annotation( |
cloneToken(node.atSign), |
cloneNode(node.name), |
cloneToken(node.period), |
@@ -131,20 +132,20 @@ class AstCloner implements AstVisitor<AstNode> { |
cloneNode(node.arguments)); |
@override |
- ArgumentList visitArgumentList(ArgumentList node) => new ArgumentList( |
+ ArgumentList visitArgumentList(ArgumentList node) => astFactory.argumentList( |
cloneToken(node.leftParenthesis), |
cloneNodeList(node.arguments), |
cloneToken(node.rightParenthesis)); |
@override |
- AsExpression visitAsExpression(AsExpression node) => new AsExpression( |
+ AsExpression visitAsExpression(AsExpression node) => astFactory.asExpression( |
cloneNode(node.expression), |
cloneToken(node.asOperator), |
cloneNode(node.type)); |
@override |
AstNode visitAssertInitializer(AssertInitializer node) => |
- new AssertInitializer( |
+ astFactory.assertInitializer( |
cloneToken(node.assertKeyword), |
cloneToken(node.leftParenthesis), |
cloneNode(node.condition), |
@@ -153,56 +154,56 @@ class AstCloner implements AstVisitor<AstNode> { |
cloneToken(node.rightParenthesis)); |
@override |
- AstNode visitAssertStatement(AssertStatement node) => new AssertStatement( |
- cloneToken(node.assertKeyword), |
- cloneToken(node.leftParenthesis), |
- cloneNode(node.condition), |
- cloneToken(node.comma), |
- cloneNode(node.message), |
- cloneToken(node.rightParenthesis), |
- cloneToken(node.semicolon)); |
+ AstNode visitAssertStatement(AssertStatement node) => |
+ astFactory.assertStatement( |
+ cloneToken(node.assertKeyword), |
+ cloneToken(node.leftParenthesis), |
+ cloneNode(node.condition), |
+ cloneToken(node.comma), |
+ cloneNode(node.message), |
+ cloneToken(node.rightParenthesis), |
+ cloneToken(node.semicolon)); |
@override |
AssignmentExpression visitAssignmentExpression(AssignmentExpression node) => |
- new AssignmentExpression(cloneNode(node.leftHandSide), |
+ astFactory.assignmentExpression(cloneNode(node.leftHandSide), |
cloneToken(node.operator), cloneNode(node.rightHandSide)); |
@override |
AwaitExpression visitAwaitExpression(AwaitExpression node) => |
- new AwaitExpression( |
+ astFactory.awaitExpression( |
cloneToken(node.awaitKeyword), cloneNode(node.expression)); |
@override |
BinaryExpression visitBinaryExpression(BinaryExpression node) => |
- new BinaryExpression(cloneNode(node.leftOperand), |
+ astFactory.binaryExpression(cloneNode(node.leftOperand), |
cloneToken(node.operator), cloneNode(node.rightOperand)); |
@override |
- Block visitBlock(Block node) => new Block(cloneToken(node.leftBracket), |
+ Block visitBlock(Block node) => astFactory.block(cloneToken(node.leftBracket), |
cloneNodeList(node.statements), cloneToken(node.rightBracket)); |
@override |
BlockFunctionBody visitBlockFunctionBody(BlockFunctionBody node) => |
- new BlockFunctionBody(cloneToken(node.keyword), cloneToken(node.star), |
- cloneNode(node.block)); |
+ astFactory.blockFunctionBody(cloneToken(node.keyword), |
+ cloneToken(node.star), cloneNode(node.block)); |
@override |
BooleanLiteral visitBooleanLiteral(BooleanLiteral node) => |
- new BooleanLiteral(cloneToken(node.literal), node.value); |
+ astFactory.booleanLiteral(cloneToken(node.literal), node.value); |
@override |
- BreakStatement visitBreakStatement(BreakStatement node) => new BreakStatement( |
- cloneToken(node.breakKeyword), |
- cloneNode(node.label), |
- cloneToken(node.semicolon)); |
+ BreakStatement visitBreakStatement(BreakStatement node) => |
+ astFactory.breakStatement(cloneToken(node.breakKeyword), |
+ cloneNode(node.label), cloneToken(node.semicolon)); |
@override |
CascadeExpression visitCascadeExpression(CascadeExpression node) => |
- new CascadeExpression( |
+ astFactory.cascadeExpression( |
cloneNode(node.target), cloneNodeList(node.cascadeSections)); |
@override |
- CatchClause visitCatchClause(CatchClause node) => new CatchClause( |
+ CatchClause visitCatchClause(CatchClause node) => astFactory.catchClause( |
cloneToken(node.onKeyword), |
cloneNode(node.exceptionType), |
cloneToken(node.catchKeyword), |
@@ -215,7 +216,7 @@ class AstCloner implements AstVisitor<AstNode> { |
@override |
ClassDeclaration visitClassDeclaration(ClassDeclaration node) { |
- ClassDeclaration copy = new ClassDeclaration( |
+ ClassDeclaration copy = astFactory.classDeclaration( |
cloneNode(node.documentationComment), |
cloneNodeList(node.metadata), |
cloneToken(node.abstractKeyword), |
@@ -235,7 +236,7 @@ class AstCloner implements AstVisitor<AstNode> { |
@override |
ClassTypeAlias visitClassTypeAlias(ClassTypeAlias node) { |
cloneToken(node.abstractKeyword); |
- return new ClassTypeAlias( |
+ return astFactory.classTypeAlias( |
cloneNode(node.documentationComment), |
cloneNodeList(node.metadata), |
cloneToken(node.typedefKeyword), |
@@ -252,22 +253,22 @@ class AstCloner implements AstVisitor<AstNode> { |
@override |
Comment visitComment(Comment node) { |
if (node.isDocumentation) { |
- return Comment.createDocumentationCommentWithReferences( |
+ return astFactory.documentationComment( |
cloneTokenList(node.tokens), cloneNodeList(node.references)); |
} else if (node.isBlock) { |
- return Comment.createBlockComment(cloneTokenList(node.tokens)); |
+ return astFactory.blockComment(cloneTokenList(node.tokens)); |
} |
- return Comment.createEndOfLineComment(cloneTokenList(node.tokens)); |
+ return astFactory.endOfLineComment(cloneTokenList(node.tokens)); |
} |
@override |
CommentReference visitCommentReference(CommentReference node) => |
- new CommentReference( |
+ astFactory.commentReference( |
cloneToken(node.newKeyword), cloneNode(node.identifier)); |
@override |
CompilationUnit visitCompilationUnit(CompilationUnit node) { |
- CompilationUnit clone = new CompilationUnit( |
+ CompilationUnit clone = astFactory.compilationUnit( |
cloneToken(node.beginToken), |
cloneNode(node.scriptTag), |
cloneNodeList(node.directives), |
@@ -280,7 +281,7 @@ class AstCloner implements AstVisitor<AstNode> { |
@override |
ConditionalExpression visitConditionalExpression( |
ConditionalExpression node) => |
- new ConditionalExpression( |
+ astFactory.conditionalExpression( |
cloneNode(node.condition), |
cloneToken(node.question), |
cloneNode(node.thenExpression), |
@@ -288,19 +289,20 @@ class AstCloner implements AstVisitor<AstNode> { |
cloneNode(node.elseExpression)); |
@override |
- Configuration visitConfiguration(Configuration node) => new Configuration( |
- cloneToken(node.ifKeyword), |
- cloneToken(node.leftParenthesis), |
- cloneNode(node.name), |
- cloneToken(node.equalToken), |
- cloneNode(node.value), |
- cloneToken(node.rightParenthesis), |
- cloneNode(node.uri)); |
+ Configuration visitConfiguration(Configuration node) => |
+ astFactory.configuration( |
+ cloneToken(node.ifKeyword), |
+ cloneToken(node.leftParenthesis), |
+ cloneNode(node.name), |
+ cloneToken(node.equalToken), |
+ cloneNode(node.value), |
+ cloneToken(node.rightParenthesis), |
+ cloneNode(node.uri)); |
@override |
ConstructorDeclaration visitConstructorDeclaration( |
ConstructorDeclaration node) => |
- new ConstructorDeclaration( |
+ astFactory.constructorDeclaration( |
cloneNode(node.documentationComment), |
cloneNodeList(node.metadata), |
cloneToken(node.externalKeyword), |
@@ -318,7 +320,7 @@ class AstCloner implements AstVisitor<AstNode> { |
@override |
ConstructorFieldInitializer visitConstructorFieldInitializer( |
ConstructorFieldInitializer node) => |
- new ConstructorFieldInitializer( |
+ astFactory.constructorFieldInitializer( |
cloneToken(node.thisKeyword), |
cloneToken(node.period), |
cloneNode(node.fieldName), |
@@ -327,17 +329,17 @@ class AstCloner implements AstVisitor<AstNode> { |
@override |
ConstructorName visitConstructorName(ConstructorName node) => |
- new ConstructorName( |
+ astFactory.constructorName( |
cloneNode(node.type), cloneToken(node.period), cloneNode(node.name)); |
@override |
ContinueStatement visitContinueStatement(ContinueStatement node) => |
- new ContinueStatement(cloneToken(node.continueKeyword), |
+ astFactory.continueStatement(cloneToken(node.continueKeyword), |
cloneNode(node.label), cloneToken(node.semicolon)); |
@override |
DeclaredIdentifier visitDeclaredIdentifier(DeclaredIdentifier node) => |
- new DeclaredIdentifier( |
+ astFactory.declaredIdentifier( |
cloneNode(node.documentationComment), |
cloneNodeList(node.metadata), |
cloneToken(node.keyword), |
@@ -347,11 +349,11 @@ class AstCloner implements AstVisitor<AstNode> { |
@override |
DefaultFormalParameter visitDefaultFormalParameter( |
DefaultFormalParameter node) => |
- new DefaultFormalParameter(cloneNode(node.parameter), node.kind, |
+ astFactory.defaultFormalParameter(cloneNode(node.parameter), node.kind, |
cloneToken(node.separator), cloneNode(node.defaultValue)); |
@override |
- DoStatement visitDoStatement(DoStatement node) => new DoStatement( |
+ DoStatement visitDoStatement(DoStatement node) => astFactory.doStatement( |
cloneToken(node.doKeyword), |
cloneNode(node.body), |
cloneToken(node.whileKeyword), |
@@ -362,28 +364,28 @@ class AstCloner implements AstVisitor<AstNode> { |
@override |
DottedName visitDottedName(DottedName node) => |
- new DottedName(cloneNodeList(node.components)); |
+ astFactory.dottedName(cloneNodeList(node.components)); |
@override |
DoubleLiteral visitDoubleLiteral(DoubleLiteral node) => |
- new DoubleLiteral(cloneToken(node.literal), node.value); |
+ astFactory.doubleLiteral(cloneToken(node.literal), node.value); |
@override |
EmptyFunctionBody visitEmptyFunctionBody(EmptyFunctionBody node) => |
- new EmptyFunctionBody(cloneToken(node.semicolon)); |
+ astFactory.emptyFunctionBody(cloneToken(node.semicolon)); |
@override |
EmptyStatement visitEmptyStatement(EmptyStatement node) => |
- new EmptyStatement(cloneToken(node.semicolon)); |
+ astFactory.emptyStatement(cloneToken(node.semicolon)); |
@override |
AstNode visitEnumConstantDeclaration(EnumConstantDeclaration node) => |
- new EnumConstantDeclaration(cloneNode(node.documentationComment), |
+ astFactory.enumConstantDeclaration(cloneNode(node.documentationComment), |
cloneNodeList(node.metadata), cloneNode(node.name)); |
@override |
EnumDeclaration visitEnumDeclaration(EnumDeclaration node) => |
- new EnumDeclaration( |
+ astFactory.enumDeclaration( |
cloneNode(node.documentationComment), |
cloneNodeList(node.metadata), |
cloneToken(node.enumKeyword), |
@@ -394,7 +396,7 @@ class AstCloner implements AstVisitor<AstNode> { |
@override |
ExportDirective visitExportDirective(ExportDirective node) { |
- ExportDirectiveImpl directive = new ExportDirective( |
+ ExportDirectiveImpl directive = astFactory.exportDirective( |
cloneNode(node.documentationComment), |
cloneNodeList(node.metadata), |
cloneToken(node.keyword), |
@@ -412,7 +414,7 @@ class AstCloner implements AstVisitor<AstNode> { |
@override |
ExpressionFunctionBody visitExpressionFunctionBody( |
ExpressionFunctionBody node) => |
- new ExpressionFunctionBody( |
+ astFactory.expressionFunctionBody( |
cloneToken(node.keyword), |
cloneToken(node.functionDefinition), |
cloneNode(node.expression), |
@@ -420,16 +422,17 @@ class AstCloner implements AstVisitor<AstNode> { |
@override |
ExpressionStatement visitExpressionStatement(ExpressionStatement node) => |
- new ExpressionStatement( |
+ astFactory.expressionStatement( |
cloneNode(node.expression), cloneToken(node.semicolon)); |
@override |
- ExtendsClause visitExtendsClause(ExtendsClause node) => new ExtendsClause( |
- cloneToken(node.extendsKeyword), cloneNode(node.superclass)); |
+ ExtendsClause visitExtendsClause(ExtendsClause node) => |
+ astFactory.extendsClause( |
+ cloneToken(node.extendsKeyword), cloneNode(node.superclass)); |
@override |
FieldDeclaration visitFieldDeclaration(FieldDeclaration node) => |
- new FieldDeclaration( |
+ astFactory.fieldDeclaration( |
cloneNode(node.documentationComment), |
cloneNodeList(node.metadata), |
cloneToken(node.staticKeyword), |
@@ -438,7 +441,7 @@ class AstCloner implements AstVisitor<AstNode> { |
@override |
FieldFormalParameter visitFieldFormalParameter(FieldFormalParameter node) => |
- new FieldFormalParameter( |
+ astFactory.fieldFormalParameter( |
cloneNode(node.documentationComment), |
cloneNodeList(node.metadata), |
cloneToken(node.keyword), |
@@ -453,7 +456,7 @@ class AstCloner implements AstVisitor<AstNode> { |
ForEachStatement visitForEachStatement(ForEachStatement node) { |
DeclaredIdentifier loopVariable = node.loopVariable; |
if (loopVariable == null) { |
- return new ForEachStatement.withReference( |
+ return astFactory.forEachStatementWithReference( |
cloneToken(node.awaitKeyword), |
cloneToken(node.forKeyword), |
cloneToken(node.leftParenthesis), |
@@ -463,7 +466,7 @@ class AstCloner implements AstVisitor<AstNode> { |
cloneToken(node.rightParenthesis), |
cloneNode(node.body)); |
} |
- return new ForEachStatement.withDeclaration( |
+ return astFactory.forEachStatementWithDeclaration( |
cloneToken(node.awaitKeyword), |
cloneToken(node.forKeyword), |
cloneToken(node.leftParenthesis), |
@@ -476,7 +479,7 @@ class AstCloner implements AstVisitor<AstNode> { |
@override |
FormalParameterList visitFormalParameterList(FormalParameterList node) => |
- new FormalParameterList( |
+ astFactory.formalParameterList( |
cloneToken(node.leftParenthesis), |
cloneNodeList(node.parameters), |
cloneToken(node.leftDelimiter), |
@@ -484,7 +487,7 @@ class AstCloner implements AstVisitor<AstNode> { |
cloneToken(node.rightParenthesis)); |
@override |
- ForStatement visitForStatement(ForStatement node) => new ForStatement( |
+ ForStatement visitForStatement(ForStatement node) => astFactory.forStatement( |
cloneToken(node.forKeyword), |
cloneToken(node.leftParenthesis), |
cloneNode(node.variables), |
@@ -498,7 +501,7 @@ class AstCloner implements AstVisitor<AstNode> { |
@override |
FunctionDeclaration visitFunctionDeclaration(FunctionDeclaration node) => |
- new FunctionDeclaration( |
+ astFactory.functionDeclaration( |
cloneNode(node.documentationComment), |
cloneNodeList(node.metadata), |
cloneToken(node.externalKeyword), |
@@ -510,22 +513,23 @@ class AstCloner implements AstVisitor<AstNode> { |
@override |
FunctionDeclarationStatement visitFunctionDeclarationStatement( |
FunctionDeclarationStatement node) => |
- new FunctionDeclarationStatement(cloneNode(node.functionDeclaration)); |
+ astFactory |
+ .functionDeclarationStatement(cloneNode(node.functionDeclaration)); |
@override |
FunctionExpression visitFunctionExpression(FunctionExpression node) => |
- new FunctionExpression(cloneNode(node.typeParameters), |
+ astFactory.functionExpression(cloneNode(node.typeParameters), |
cloneNode(node.parameters), cloneNode(node.body)); |
@override |
FunctionExpressionInvocation visitFunctionExpressionInvocation( |
FunctionExpressionInvocation node) => |
- new FunctionExpressionInvocation(cloneNode(node.function), |
+ astFactory.functionExpressionInvocation(cloneNode(node.function), |
cloneNode(node.typeArguments), cloneNode(node.argumentList)); |
@override |
FunctionTypeAlias visitFunctionTypeAlias(FunctionTypeAlias node) => |
- new FunctionTypeAlias( |
+ astFactory.functionTypeAlias( |
cloneNode(node.documentationComment), |
cloneNodeList(node.metadata), |
cloneToken(node.typedefKeyword), |
@@ -538,7 +542,7 @@ class AstCloner implements AstVisitor<AstNode> { |
@override |
FunctionTypedFormalParameter visitFunctionTypedFormalParameter( |
FunctionTypedFormalParameter node) => |
- new FunctionTypedFormalParameter( |
+ astFactory.functionTypedFormalParameter( |
cloneNode(node.documentationComment), |
cloneNodeList(node.metadata), |
cloneNode(node.returnType), |
@@ -547,11 +551,12 @@ class AstCloner implements AstVisitor<AstNode> { |
cloneNode(node.parameters)); |
@override |
- HideCombinator visitHideCombinator(HideCombinator node) => new HideCombinator( |
- cloneToken(node.keyword), cloneNodeList(node.hiddenNames)); |
+ HideCombinator visitHideCombinator(HideCombinator node) => |
+ astFactory.hideCombinator( |
+ cloneToken(node.keyword), cloneNodeList(node.hiddenNames)); |
@override |
- IfStatement visitIfStatement(IfStatement node) => new IfStatement( |
+ IfStatement visitIfStatement(IfStatement node) => astFactory.ifStatement( |
cloneToken(node.ifKeyword), |
cloneToken(node.leftParenthesis), |
cloneNode(node.condition), |
@@ -562,12 +567,12 @@ class AstCloner implements AstVisitor<AstNode> { |
@override |
ImplementsClause visitImplementsClause(ImplementsClause node) => |
- new ImplementsClause( |
+ astFactory.implementsClause( |
cloneToken(node.implementsKeyword), cloneNodeList(node.interfaces)); |
@override |
ImportDirective visitImportDirective(ImportDirective node) { |
- ImportDirectiveImpl directive = new ImportDirective( |
+ ImportDirectiveImpl directive = astFactory.importDirective( |
cloneNode(node.documentationComment), |
cloneNodeList(node.metadata), |
cloneToken(node.keyword), |
@@ -589,13 +594,13 @@ class AstCloner implements AstVisitor<AstNode> { |
IndexExpression visitIndexExpression(IndexExpression node) { |
Token period = node.period; |
if (period == null) { |
- return new IndexExpression.forTarget( |
+ return astFactory.indexExpressionForTarget( |
cloneNode(node.target), |
cloneToken(node.leftBracket), |
cloneNode(node.index), |
cloneToken(node.rightBracket)); |
} else { |
- return new IndexExpression.forCascade( |
+ return astFactory.indexExpressionForCascade( |
cloneToken(period), |
cloneToken(node.leftBracket), |
cloneNode(node.index), |
@@ -606,25 +611,25 @@ class AstCloner implements AstVisitor<AstNode> { |
@override |
InstanceCreationExpression visitInstanceCreationExpression( |
InstanceCreationExpression node) => |
- new InstanceCreationExpression(cloneToken(node.keyword), |
+ astFactory.instanceCreationExpression(cloneToken(node.keyword), |
cloneNode(node.constructorName), cloneNode(node.argumentList)); |
@override |
IntegerLiteral visitIntegerLiteral(IntegerLiteral node) => |
- new IntegerLiteral(cloneToken(node.literal), node.value); |
+ astFactory.integerLiteral(cloneToken(node.literal), node.value); |
@override |
InterpolationExpression visitInterpolationExpression( |
InterpolationExpression node) => |
- new InterpolationExpression(cloneToken(node.leftBracket), |
+ astFactory.interpolationExpression(cloneToken(node.leftBracket), |
cloneNode(node.expression), cloneToken(node.rightBracket)); |
@override |
InterpolationString visitInterpolationString(InterpolationString node) => |
- new InterpolationString(cloneToken(node.contents), node.value); |
+ astFactory.interpolationString(cloneToken(node.contents), node.value); |
@override |
- IsExpression visitIsExpression(IsExpression node) => new IsExpression( |
+ IsExpression visitIsExpression(IsExpression node) => astFactory.isExpression( |
cloneNode(node.expression), |
cloneToken(node.isOperator), |
cloneToken(node.notOperator), |
@@ -632,16 +637,15 @@ class AstCloner implements AstVisitor<AstNode> { |
@override |
Label visitLabel(Label node) => |
- new Label(cloneNode(node.label), cloneToken(node.colon)); |
+ astFactory.label(cloneNode(node.label), cloneToken(node.colon)); |
@override |
- LabeledStatement visitLabeledStatement(LabeledStatement node) => |
- new LabeledStatement( |
- cloneNodeList(node.labels), cloneNode(node.statement)); |
+ LabeledStatement visitLabeledStatement(LabeledStatement node) => astFactory |
+ .labeledStatement(cloneNodeList(node.labels), cloneNode(node.statement)); |
@override |
LibraryDirective visitLibraryDirective(LibraryDirective node) => |
- new LibraryDirective( |
+ astFactory.libraryDirective( |
cloneNode(node.documentationComment), |
cloneNodeList(node.metadata), |
cloneToken(node.libraryKeyword), |
@@ -650,10 +654,10 @@ class AstCloner implements AstVisitor<AstNode> { |
@override |
LibraryIdentifier visitLibraryIdentifier(LibraryIdentifier node) => |
- new LibraryIdentifier(cloneNodeList(node.components)); |
+ astFactory.libraryIdentifier(cloneNodeList(node.components)); |
@override |
- ListLiteral visitListLiteral(ListLiteral node) => new ListLiteral( |
+ ListLiteral visitListLiteral(ListLiteral node) => astFactory.listLiteral( |
cloneToken(node.constKeyword), |
cloneNode(node.typeArguments), |
cloneToken(node.leftBracket), |
@@ -661,7 +665,7 @@ class AstCloner implements AstVisitor<AstNode> { |
cloneToken(node.rightBracket)); |
@override |
- MapLiteral visitMapLiteral(MapLiteral node) => new MapLiteral( |
+ MapLiteral visitMapLiteral(MapLiteral node) => astFactory.mapLiteral( |
cloneToken(node.constKeyword), |
cloneNode(node.typeArguments), |
cloneToken(node.leftBracket), |
@@ -670,12 +674,12 @@ class AstCloner implements AstVisitor<AstNode> { |
@override |
MapLiteralEntry visitMapLiteralEntry(MapLiteralEntry node) => |
- new MapLiteralEntry(cloneNode(node.key), cloneToken(node.separator), |
- cloneNode(node.value)); |
+ astFactory.mapLiteralEntry(cloneNode(node.key), |
+ cloneToken(node.separator), cloneNode(node.value)); |
@override |
MethodDeclaration visitMethodDeclaration(MethodDeclaration node) => |
- new MethodDeclaration( |
+ astFactory.methodDeclaration( |
cloneNode(node.documentationComment), |
cloneNodeList(node.metadata), |
cloneToken(node.externalKeyword), |
@@ -690,7 +694,7 @@ class AstCloner implements AstVisitor<AstNode> { |
@override |
MethodInvocation visitMethodInvocation(MethodInvocation node) => |
- new MethodInvocation( |
+ astFactory.methodInvocation( |
cloneNode(node.target), |
cloneToken(node.operator), |
cloneNode(node.methodName), |
@@ -698,31 +702,31 @@ class AstCloner implements AstVisitor<AstNode> { |
cloneNode(node.argumentList)); |
@override |
- NamedExpression visitNamedExpression(NamedExpression node) => |
- new NamedExpression(cloneNode(node.name), cloneNode(node.expression)); |
+ NamedExpression visitNamedExpression(NamedExpression node) => astFactory |
+ .namedExpression(cloneNode(node.name), cloneNode(node.expression)); |
@override |
- AstNode visitNativeClause(NativeClause node) => |
- new NativeClause(cloneToken(node.nativeKeyword), cloneNode(node.name)); |
+ AstNode visitNativeClause(NativeClause node) => astFactory.nativeClause( |
+ cloneToken(node.nativeKeyword), cloneNode(node.name)); |
@override |
NativeFunctionBody visitNativeFunctionBody(NativeFunctionBody node) => |
- new NativeFunctionBody(cloneToken(node.nativeKeyword), |
+ astFactory.nativeFunctionBody(cloneToken(node.nativeKeyword), |
cloneNode(node.stringLiteral), cloneToken(node.semicolon)); |
@override |
NullLiteral visitNullLiteral(NullLiteral node) => |
- new NullLiteral(cloneToken(node.literal)); |
+ astFactory.nullLiteral(cloneToken(node.literal)); |
@override |
ParenthesizedExpression visitParenthesizedExpression( |
ParenthesizedExpression node) => |
- new ParenthesizedExpression(cloneToken(node.leftParenthesis), |
+ astFactory.parenthesizedExpression(cloneToken(node.leftParenthesis), |
cloneNode(node.expression), cloneToken(node.rightParenthesis)); |
@override |
PartDirective visitPartDirective(PartDirective node) { |
- PartDirective directive = new PartDirective( |
+ PartDirective directive = astFactory.partDirective( |
cloneNode(node.documentationComment), |
cloneNodeList(node.metadata), |
cloneToken(node.partKeyword), |
@@ -735,7 +739,7 @@ class AstCloner implements AstVisitor<AstNode> { |
@override |
PartOfDirective visitPartOfDirective(PartOfDirective node) => |
- new PartOfDirective( |
+ astFactory.partOfDirective( |
cloneNode(node.documentationComment), |
cloneNodeList(node.metadata), |
cloneToken(node.partKeyword), |
@@ -745,28 +749,27 @@ class AstCloner implements AstVisitor<AstNode> { |
cloneToken(node.semicolon)); |
@override |
- PostfixExpression visitPostfixExpression(PostfixExpression node) => |
- new PostfixExpression(cloneNode(node.operand), cloneToken(node.operator)); |
+ PostfixExpression visitPostfixExpression(PostfixExpression node) => astFactory |
+ .postfixExpression(cloneNode(node.operand), cloneToken(node.operator)); |
@override |
PrefixedIdentifier visitPrefixedIdentifier(PrefixedIdentifier node) => |
- new PrefixedIdentifier(cloneNode(node.prefix), cloneToken(node.period), |
- cloneNode(node.identifier)); |
+ astFactory.prefixedIdentifier(cloneNode(node.prefix), |
+ cloneToken(node.period), cloneNode(node.identifier)); |
@override |
- PrefixExpression visitPrefixExpression(PrefixExpression node) => |
- new PrefixExpression(cloneToken(node.operator), cloneNode(node.operand)); |
+ PrefixExpression visitPrefixExpression(PrefixExpression node) => astFactory |
+ .prefixExpression(cloneToken(node.operator), cloneNode(node.operand)); |
@override |
- PropertyAccess visitPropertyAccess(PropertyAccess node) => new PropertyAccess( |
- cloneNode(node.target), |
- cloneToken(node.operator), |
- cloneNode(node.propertyName)); |
+ PropertyAccess visitPropertyAccess(PropertyAccess node) => |
+ astFactory.propertyAccess(cloneNode(node.target), |
+ cloneToken(node.operator), cloneNode(node.propertyName)); |
@override |
RedirectingConstructorInvocation visitRedirectingConstructorInvocation( |
RedirectingConstructorInvocation node) => |
- new RedirectingConstructorInvocation( |
+ astFactory.redirectingConstructorInvocation( |
cloneToken(node.thisKeyword), |
cloneToken(node.period), |
cloneNode(node.constructorName), |
@@ -774,25 +777,25 @@ class AstCloner implements AstVisitor<AstNode> { |
@override |
RethrowExpression visitRethrowExpression(RethrowExpression node) => |
- new RethrowExpression(cloneToken(node.rethrowKeyword)); |
+ astFactory.rethrowExpression(cloneToken(node.rethrowKeyword)); |
@override |
ReturnStatement visitReturnStatement(ReturnStatement node) => |
- new ReturnStatement(cloneToken(node.returnKeyword), |
+ astFactory.returnStatement(cloneToken(node.returnKeyword), |
cloneNode(node.expression), cloneToken(node.semicolon)); |
@override |
ScriptTag visitScriptTag(ScriptTag node) => |
- new ScriptTag(cloneToken(node.scriptTag)); |
+ astFactory.scriptTag(cloneToken(node.scriptTag)); |
@override |
- ShowCombinator visitShowCombinator(ShowCombinator node) => new ShowCombinator( |
- cloneToken(node.keyword), cloneNodeList(node.shownNames)); |
+ ShowCombinator visitShowCombinator(ShowCombinator node) => astFactory |
+ .showCombinator(cloneToken(node.keyword), cloneNodeList(node.shownNames)); |
@override |
SimpleFormalParameter visitSimpleFormalParameter( |
SimpleFormalParameter node) => |
- new SimpleFormalParameter( |
+ astFactory.simpleFormalParameter( |
cloneNode(node.documentationComment), |
cloneNodeList(node.metadata), |
cloneToken(node.keyword), |
@@ -801,21 +804,21 @@ class AstCloner implements AstVisitor<AstNode> { |
@override |
SimpleIdentifier visitSimpleIdentifier(SimpleIdentifier node) => |
- new SimpleIdentifier(cloneToken(node.token), |
+ astFactory.simpleIdentifier(cloneToken(node.token), |
isDeclaration: node.inDeclarationContext()); |
@override |
SimpleStringLiteral visitSimpleStringLiteral(SimpleStringLiteral node) => |
- new SimpleStringLiteral(cloneToken(node.literal), node.value); |
+ astFactory.simpleStringLiteral(cloneToken(node.literal), node.value); |
@override |
StringInterpolation visitStringInterpolation(StringInterpolation node) => |
- new StringInterpolation(cloneNodeList(node.elements)); |
+ astFactory.stringInterpolation(cloneNodeList(node.elements)); |
@override |
SuperConstructorInvocation visitSuperConstructorInvocation( |
SuperConstructorInvocation node) => |
- new SuperConstructorInvocation( |
+ astFactory.superConstructorInvocation( |
cloneToken(node.superKeyword), |
cloneToken(node.period), |
cloneNode(node.constructorName), |
@@ -823,10 +826,10 @@ class AstCloner implements AstVisitor<AstNode> { |
@override |
SuperExpression visitSuperExpression(SuperExpression node) => |
- new SuperExpression(cloneToken(node.superKeyword)); |
+ astFactory.superExpression(cloneToken(node.superKeyword)); |
@override |
- SwitchCase visitSwitchCase(SwitchCase node) => new SwitchCase( |
+ SwitchCase visitSwitchCase(SwitchCase node) => astFactory.switchCase( |
cloneNodeList(node.labels), |
cloneToken(node.keyword), |
cloneNode(node.expression), |
@@ -834,15 +837,16 @@ class AstCloner implements AstVisitor<AstNode> { |
cloneNodeList(node.statements)); |
@override |
- SwitchDefault visitSwitchDefault(SwitchDefault node) => new SwitchDefault( |
- cloneNodeList(node.labels), |
- cloneToken(node.keyword), |
- cloneToken(node.colon), |
- cloneNodeList(node.statements)); |
+ SwitchDefault visitSwitchDefault(SwitchDefault node) => |
+ astFactory.switchDefault( |
+ cloneNodeList(node.labels), |
+ cloneToken(node.keyword), |
+ cloneToken(node.colon), |
+ cloneNodeList(node.statements)); |
@override |
SwitchStatement visitSwitchStatement(SwitchStatement node) => |
- new SwitchStatement( |
+ astFactory.switchStatement( |
cloneToken(node.switchKeyword), |
cloneToken(node.leftParenthesis), |
cloneNode(node.expression), |
@@ -852,29 +856,30 @@ class AstCloner implements AstVisitor<AstNode> { |
cloneToken(node.rightBracket)); |
@override |
- SymbolLiteral visitSymbolLiteral(SymbolLiteral node) => new SymbolLiteral( |
- cloneToken(node.poundSign), cloneTokenList(node.components)); |
+ SymbolLiteral visitSymbolLiteral(SymbolLiteral node) => |
+ astFactory.symbolLiteral( |
+ cloneToken(node.poundSign), cloneTokenList(node.components)); |
@override |
ThisExpression visitThisExpression(ThisExpression node) => |
- new ThisExpression(cloneToken(node.thisKeyword)); |
+ astFactory.thisExpression(cloneToken(node.thisKeyword)); |
@override |
ThrowExpression visitThrowExpression(ThrowExpression node) => |
- new ThrowExpression( |
+ astFactory.throwExpression( |
cloneToken(node.throwKeyword), cloneNode(node.expression)); |
@override |
TopLevelVariableDeclaration visitTopLevelVariableDeclaration( |
TopLevelVariableDeclaration node) => |
- new TopLevelVariableDeclaration( |
+ astFactory.topLevelVariableDeclaration( |
cloneNode(node.documentationComment), |
cloneNodeList(node.metadata), |
cloneNode(node.variables), |
cloneToken(node.semicolon)); |
@override |
- TryStatement visitTryStatement(TryStatement node) => new TryStatement( |
+ TryStatement visitTryStatement(TryStatement node) => astFactory.tryStatement( |
cloneToken(node.tryKeyword), |
cloneNode(node.body), |
cloneNodeList(node.catchClauses), |
@@ -883,35 +888,36 @@ class AstCloner implements AstVisitor<AstNode> { |
@override |
TypeArgumentList visitTypeArgumentList(TypeArgumentList node) => |
- new TypeArgumentList(cloneToken(node.leftBracket), |
+ astFactory.typeArgumentList(cloneToken(node.leftBracket), |
cloneNodeList(node.arguments), cloneToken(node.rightBracket)); |
@override |
TypeName visitTypeName(TypeName node) => |
- new TypeName(cloneNode(node.name), cloneNode(node.typeArguments)); |
+ astFactory.typeName(cloneNode(node.name), cloneNode(node.typeArguments)); |
@override |
- TypeParameter visitTypeParameter(TypeParameter node) => new TypeParameter( |
- cloneNode(node.documentationComment), |
- cloneNodeList(node.metadata), |
- cloneNode(node.name), |
- cloneToken(node.extendsKeyword), |
- cloneNode(node.bound)); |
+ TypeParameter visitTypeParameter(TypeParameter node) => |
+ astFactory.typeParameter( |
+ cloneNode(node.documentationComment), |
+ cloneNodeList(node.metadata), |
+ cloneNode(node.name), |
+ cloneToken(node.extendsKeyword), |
+ cloneNode(node.bound)); |
@override |
TypeParameterList visitTypeParameterList(TypeParameterList node) => |
- new TypeParameterList(cloneToken(node.leftBracket), |
+ astFactory.typeParameterList(cloneToken(node.leftBracket), |
cloneNodeList(node.typeParameters), cloneToken(node.rightBracket)); |
@override |
VariableDeclaration visitVariableDeclaration(VariableDeclaration node) => |
- new VariableDeclaration(cloneNode(node.name), cloneToken(node.equals), |
- cloneNode(node.initializer)); |
+ astFactory.variableDeclaration(cloneNode(node.name), |
+ cloneToken(node.equals), cloneNode(node.initializer)); |
@override |
VariableDeclarationList visitVariableDeclarationList( |
VariableDeclarationList node) => |
- new VariableDeclarationList( |
+ astFactory.variableDeclarationList( |
cloneNode(node.documentationComment), |
cloneNodeList(node.metadata), |
cloneToken(node.keyword), |
@@ -921,27 +927,29 @@ class AstCloner implements AstVisitor<AstNode> { |
@override |
VariableDeclarationStatement visitVariableDeclarationStatement( |
VariableDeclarationStatement node) => |
- new VariableDeclarationStatement( |
+ astFactory.variableDeclarationStatement( |
cloneNode(node.variables), cloneToken(node.semicolon)); |
@override |
- WhileStatement visitWhileStatement(WhileStatement node) => new WhileStatement( |
- cloneToken(node.whileKeyword), |
- cloneToken(node.leftParenthesis), |
- cloneNode(node.condition), |
- cloneToken(node.rightParenthesis), |
- cloneNode(node.body)); |
+ WhileStatement visitWhileStatement(WhileStatement node) => |
+ astFactory.whileStatement( |
+ cloneToken(node.whileKeyword), |
+ cloneToken(node.leftParenthesis), |
+ cloneNode(node.condition), |
+ cloneToken(node.rightParenthesis), |
+ cloneNode(node.body)); |
@override |
- WithClause visitWithClause(WithClause node) => new WithClause( |
+ WithClause visitWithClause(WithClause node) => astFactory.withClause( |
cloneToken(node.withKeyword), cloneNodeList(node.mixinTypes)); |
@override |
- YieldStatement visitYieldStatement(YieldStatement node) => new YieldStatement( |
- cloneToken(node.yieldKeyword), |
- cloneToken(node.star), |
- cloneNode(node.expression), |
- cloneToken(node.semicolon)); |
+ YieldStatement visitYieldStatement(YieldStatement node) => |
+ astFactory.yieldStatement( |
+ cloneToken(node.yieldKeyword), |
+ cloneToken(node.star), |
+ cloneNode(node.expression), |
+ cloneToken(node.semicolon)); |
/** |
* Clone all token starting from the given [token] up to a token that has |
@@ -2755,11 +2763,11 @@ class IncrementalAstCloner implements AstVisitor<AstNode> { |
@override |
AdjacentStrings visitAdjacentStrings(AdjacentStrings node) => |
- new AdjacentStrings(_cloneNodeList(node.strings)); |
+ astFactory.adjacentStrings(_cloneNodeList(node.strings)); |
@override |
Annotation visitAnnotation(Annotation node) { |
- Annotation copy = new Annotation( |
+ Annotation copy = astFactory.annotation( |
_mapToken(node.atSign), |
_cloneNode(node.name), |
_mapToken(node.period), |
@@ -2770,14 +2778,14 @@ class IncrementalAstCloner implements AstVisitor<AstNode> { |
} |
@override |
- ArgumentList visitArgumentList(ArgumentList node) => new ArgumentList( |
+ ArgumentList visitArgumentList(ArgumentList node) => astFactory.argumentList( |
_mapToken(node.leftParenthesis), |
_cloneNodeList(node.arguments), |
_mapToken(node.rightParenthesis)); |
@override |
AsExpression visitAsExpression(AsExpression node) { |
- AsExpression copy = new AsExpression(_cloneNode(node.expression), |
+ AsExpression copy = astFactory.asExpression(_cloneNode(node.expression), |
_mapToken(node.asOperator), _cloneNode(node.type)); |
copy.propagatedType = node.propagatedType; |
copy.staticType = node.staticType; |
@@ -2786,7 +2794,7 @@ class IncrementalAstCloner implements AstVisitor<AstNode> { |
@override |
AstNode visitAssertInitializer(AssertInitializer node) => |
- new AssertInitializer( |
+ astFactory.assertInitializer( |
_mapToken(node.assertKeyword), |
_mapToken(node.leftParenthesis), |
_cloneNode(node.condition), |
@@ -2795,18 +2803,19 @@ class IncrementalAstCloner implements AstVisitor<AstNode> { |
_mapToken(node.rightParenthesis)); |
@override |
- AstNode visitAssertStatement(AssertStatement node) => new AssertStatement( |
- _mapToken(node.assertKeyword), |
- _mapToken(node.leftParenthesis), |
- _cloneNode(node.condition), |
- _mapToken(node.comma), |
- _cloneNode(node.message), |
- _mapToken(node.rightParenthesis), |
- _mapToken(node.semicolon)); |
+ AstNode visitAssertStatement(AssertStatement node) => |
+ astFactory.assertStatement( |
+ _mapToken(node.assertKeyword), |
+ _mapToken(node.leftParenthesis), |
+ _cloneNode(node.condition), |
+ _mapToken(node.comma), |
+ _cloneNode(node.message), |
+ _mapToken(node.rightParenthesis), |
+ _mapToken(node.semicolon)); |
@override |
AssignmentExpression visitAssignmentExpression(AssignmentExpression node) { |
- AssignmentExpression copy = new AssignmentExpression( |
+ AssignmentExpression copy = astFactory.assignmentExpression( |
_cloneNode(node.leftHandSide), |
_mapToken(node.operator), |
_cloneNode(node.rightHandSide)); |
@@ -2819,13 +2828,15 @@ class IncrementalAstCloner implements AstVisitor<AstNode> { |
@override |
AwaitExpression visitAwaitExpression(AwaitExpression node) => |
- new AwaitExpression( |
+ astFactory.awaitExpression( |
_mapToken(node.awaitKeyword), _cloneNode(node.expression)); |
@override |
BinaryExpression visitBinaryExpression(BinaryExpression node) { |
- BinaryExpression copy = new BinaryExpression(_cloneNode(node.leftOperand), |
- _mapToken(node.operator), _cloneNode(node.rightOperand)); |
+ BinaryExpression copy = astFactory.binaryExpression( |
+ _cloneNode(node.leftOperand), |
+ _mapToken(node.operator), |
+ _cloneNode(node.rightOperand)); |
copy.propagatedElement = node.propagatedElement; |
copy.propagatedType = node.propagatedType; |
copy.staticElement = node.staticElement; |
@@ -2834,32 +2845,31 @@ class IncrementalAstCloner implements AstVisitor<AstNode> { |
} |
@override |
- Block visitBlock(Block node) => new Block(_mapToken(node.leftBracket), |
+ Block visitBlock(Block node) => astFactory.block(_mapToken(node.leftBracket), |
_cloneNodeList(node.statements), _mapToken(node.rightBracket)); |
@override |
BlockFunctionBody visitBlockFunctionBody(BlockFunctionBody node) => |
- new BlockFunctionBody(_mapToken(node.keyword), _mapToken(node.star), |
- _cloneNode(node.block)); |
+ astFactory.blockFunctionBody(_mapToken(node.keyword), |
+ _mapToken(node.star), _cloneNode(node.block)); |
@override |
BooleanLiteral visitBooleanLiteral(BooleanLiteral node) { |
BooleanLiteral copy = |
- new BooleanLiteral(_mapToken(node.literal), node.value); |
+ astFactory.booleanLiteral(_mapToken(node.literal), node.value); |
copy.propagatedType = node.propagatedType; |
copy.staticType = node.staticType; |
return copy; |
} |
@override |
- BreakStatement visitBreakStatement(BreakStatement node) => new BreakStatement( |
- _mapToken(node.breakKeyword), |
- _cloneNode(node.label), |
- _mapToken(node.semicolon)); |
+ BreakStatement visitBreakStatement(BreakStatement node) => |
+ astFactory.breakStatement(_mapToken(node.breakKeyword), |
+ _cloneNode(node.label), _mapToken(node.semicolon)); |
@override |
CascadeExpression visitCascadeExpression(CascadeExpression node) { |
- CascadeExpression copy = new CascadeExpression( |
+ CascadeExpression copy = astFactory.cascadeExpression( |
_cloneNode(node.target), _cloneNodeList(node.cascadeSections)); |
copy.propagatedType = node.propagatedType; |
copy.staticType = node.staticType; |
@@ -2867,7 +2877,7 @@ class IncrementalAstCloner implements AstVisitor<AstNode> { |
} |
@override |
- CatchClause visitCatchClause(CatchClause node) => new CatchClause( |
+ CatchClause visitCatchClause(CatchClause node) => astFactory.catchClause( |
_mapToken(node.onKeyword), |
_cloneNode(node.exceptionType), |
_mapToken(node.catchKeyword), |
@@ -2880,7 +2890,7 @@ class IncrementalAstCloner implements AstVisitor<AstNode> { |
@override |
ClassDeclaration visitClassDeclaration(ClassDeclaration node) { |
- ClassDeclaration copy = new ClassDeclaration( |
+ ClassDeclaration copy = astFactory.classDeclaration( |
_cloneNode(node.documentationComment), |
_cloneNodeList(node.metadata), |
_mapToken(node.abstractKeyword), |
@@ -2898,38 +2908,39 @@ class IncrementalAstCloner implements AstVisitor<AstNode> { |
} |
@override |
- ClassTypeAlias visitClassTypeAlias(ClassTypeAlias node) => new ClassTypeAlias( |
- _cloneNode(node.documentationComment), |
- _cloneNodeList(node.metadata), |
- _mapToken(node.typedefKeyword), |
- _cloneNode(node.name), |
- _cloneNode(node.typeParameters), |
- _mapToken(node.equals), |
- _mapToken(node.abstractKeyword), |
- _cloneNode(node.superclass), |
- _cloneNode(node.withClause), |
- _cloneNode(node.implementsClause), |
- _mapToken(node.semicolon)); |
+ ClassTypeAlias visitClassTypeAlias(ClassTypeAlias node) => |
+ astFactory.classTypeAlias( |
+ _cloneNode(node.documentationComment), |
+ _cloneNodeList(node.metadata), |
+ _mapToken(node.typedefKeyword), |
+ _cloneNode(node.name), |
+ _cloneNode(node.typeParameters), |
+ _mapToken(node.equals), |
+ _mapToken(node.abstractKeyword), |
+ _cloneNode(node.superclass), |
+ _cloneNode(node.withClause), |
+ _cloneNode(node.implementsClause), |
+ _mapToken(node.semicolon)); |
@override |
Comment visitComment(Comment node) { |
if (node.isDocumentation) { |
- return Comment.createDocumentationCommentWithReferences( |
+ return astFactory.documentationComment( |
_mapTokens(node.tokens), _cloneNodeList(node.references)); |
} else if (node.isBlock) { |
- return Comment.createBlockComment(_mapTokens(node.tokens)); |
+ return astFactory.blockComment(_mapTokens(node.tokens)); |
} |
- return Comment.createEndOfLineComment(_mapTokens(node.tokens)); |
+ return astFactory.endOfLineComment(_mapTokens(node.tokens)); |
} |
@override |
CommentReference visitCommentReference(CommentReference node) => |
- new CommentReference( |
+ astFactory.commentReference( |
_mapToken(node.newKeyword), _cloneNode(node.identifier)); |
@override |
CompilationUnit visitCompilationUnit(CompilationUnit node) { |
- CompilationUnit copy = new CompilationUnit( |
+ CompilationUnit copy = astFactory.compilationUnit( |
_mapToken(node.beginToken), |
_cloneNode(node.scriptTag), |
_cloneNodeList(node.directives), |
@@ -2942,7 +2953,7 @@ class IncrementalAstCloner implements AstVisitor<AstNode> { |
@override |
ConditionalExpression visitConditionalExpression(ConditionalExpression node) { |
- ConditionalExpression copy = new ConditionalExpression( |
+ ConditionalExpression copy = astFactory.conditionalExpression( |
_cloneNode(node.condition), |
_mapToken(node.question), |
_cloneNode(node.thenExpression), |
@@ -2954,19 +2965,20 @@ class IncrementalAstCloner implements AstVisitor<AstNode> { |
} |
@override |
- Configuration visitConfiguration(Configuration node) => new Configuration( |
- _mapToken(node.ifKeyword), |
- _mapToken(node.leftParenthesis), |
- _cloneNode(node.name), |
- _mapToken(node.equalToken), |
- _cloneNode(node.value), |
- _mapToken(node.rightParenthesis), |
- _cloneNode(node.uri)); |
+ Configuration visitConfiguration(Configuration node) => |
+ astFactory.configuration( |
+ _mapToken(node.ifKeyword), |
+ _mapToken(node.leftParenthesis), |
+ _cloneNode(node.name), |
+ _mapToken(node.equalToken), |
+ _cloneNode(node.value), |
+ _mapToken(node.rightParenthesis), |
+ _cloneNode(node.uri)); |
@override |
ConstructorDeclaration visitConstructorDeclaration( |
ConstructorDeclaration node) { |
- ConstructorDeclaration copy = new ConstructorDeclaration( |
+ ConstructorDeclaration copy = astFactory.constructorDeclaration( |
_cloneNode(node.documentationComment), |
_cloneNodeList(node.metadata), |
_mapToken(node.externalKeyword), |
@@ -2987,7 +2999,7 @@ class IncrementalAstCloner implements AstVisitor<AstNode> { |
@override |
ConstructorFieldInitializer visitConstructorFieldInitializer( |
ConstructorFieldInitializer node) => |
- new ConstructorFieldInitializer( |
+ astFactory.constructorFieldInitializer( |
_mapToken(node.thisKeyword), |
_mapToken(node.period), |
_cloneNode(node.fieldName), |
@@ -2996,7 +3008,7 @@ class IncrementalAstCloner implements AstVisitor<AstNode> { |
@override |
ConstructorName visitConstructorName(ConstructorName node) { |
- ConstructorName copy = new ConstructorName( |
+ ConstructorName copy = astFactory.constructorName( |
_cloneNode(node.type), _mapToken(node.period), _cloneNode(node.name)); |
copy.staticElement = node.staticElement; |
return copy; |
@@ -3004,12 +3016,12 @@ class IncrementalAstCloner implements AstVisitor<AstNode> { |
@override |
ContinueStatement visitContinueStatement(ContinueStatement node) => |
- new ContinueStatement(_mapToken(node.continueKeyword), |
+ astFactory.continueStatement(_mapToken(node.continueKeyword), |
_cloneNode(node.label), _mapToken(node.semicolon)); |
@override |
DeclaredIdentifier visitDeclaredIdentifier(DeclaredIdentifier node) => |
- new DeclaredIdentifier( |
+ astFactory.declaredIdentifier( |
_cloneNode(node.documentationComment), |
_cloneNodeList(node.metadata), |
_mapToken(node.keyword), |
@@ -3019,11 +3031,11 @@ class IncrementalAstCloner implements AstVisitor<AstNode> { |
@override |
DefaultFormalParameter visitDefaultFormalParameter( |
DefaultFormalParameter node) => |
- new DefaultFormalParameter(_cloneNode(node.parameter), node.kind, |
+ astFactory.defaultFormalParameter(_cloneNode(node.parameter), node.kind, |
_mapToken(node.separator), _cloneNode(node.defaultValue)); |
@override |
- DoStatement visitDoStatement(DoStatement node) => new DoStatement( |
+ DoStatement visitDoStatement(DoStatement node) => astFactory.doStatement( |
_mapToken(node.doKeyword), |
_cloneNode(node.body), |
_mapToken(node.whileKeyword), |
@@ -3034,11 +3046,12 @@ class IncrementalAstCloner implements AstVisitor<AstNode> { |
@override |
DottedName visitDottedName(DottedName node) => |
- new DottedName(_cloneNodeList(node.components)); |
+ astFactory.dottedName(_cloneNodeList(node.components)); |
@override |
DoubleLiteral visitDoubleLiteral(DoubleLiteral node) { |
- DoubleLiteral copy = new DoubleLiteral(_mapToken(node.literal), node.value); |
+ DoubleLiteral copy = |
+ astFactory.doubleLiteral(_mapToken(node.literal), node.value); |
copy.propagatedType = node.propagatedType; |
copy.staticType = node.staticType; |
return copy; |
@@ -3046,30 +3059,31 @@ class IncrementalAstCloner implements AstVisitor<AstNode> { |
@override |
EmptyFunctionBody visitEmptyFunctionBody(EmptyFunctionBody node) => |
- new EmptyFunctionBody(_mapToken(node.semicolon)); |
+ astFactory.emptyFunctionBody(_mapToken(node.semicolon)); |
@override |
EmptyStatement visitEmptyStatement(EmptyStatement node) => |
- new EmptyStatement(_mapToken(node.semicolon)); |
+ astFactory.emptyStatement(_mapToken(node.semicolon)); |
@override |
AstNode visitEnumConstantDeclaration(EnumConstantDeclaration node) => |
- new EnumConstantDeclaration(_cloneNode(node.documentationComment), |
+ astFactory.enumConstantDeclaration(_cloneNode(node.documentationComment), |
_cloneNodeList(node.metadata), _cloneNode(node.name)); |
@override |
- AstNode visitEnumDeclaration(EnumDeclaration node) => new EnumDeclaration( |
- _cloneNode(node.documentationComment), |
- _cloneNodeList(node.metadata), |
- _mapToken(node.enumKeyword), |
- _cloneNode(node.name), |
- _mapToken(node.leftBracket), |
- _cloneNodeList(node.constants), |
- _mapToken(node.rightBracket)); |
+ AstNode visitEnumDeclaration(EnumDeclaration node) => |
+ astFactory.enumDeclaration( |
+ _cloneNode(node.documentationComment), |
+ _cloneNodeList(node.metadata), |
+ _mapToken(node.enumKeyword), |
+ _cloneNode(node.name), |
+ _mapToken(node.leftBracket), |
+ _cloneNodeList(node.constants), |
+ _mapToken(node.rightBracket)); |
@override |
ExportDirective visitExportDirective(ExportDirective node) { |
- ExportDirective copy = new ExportDirective( |
+ ExportDirective copy = astFactory.exportDirective( |
_cloneNode(node.documentationComment), |
_cloneNodeList(node.metadata), |
_mapToken(node.keyword), |
@@ -3084,7 +3098,7 @@ class IncrementalAstCloner implements AstVisitor<AstNode> { |
@override |
ExpressionFunctionBody visitExpressionFunctionBody( |
ExpressionFunctionBody node) => |
- new ExpressionFunctionBody( |
+ astFactory.expressionFunctionBody( |
_mapToken(node.keyword), |
_mapToken(node.functionDefinition), |
_cloneNode(node.expression), |
@@ -3092,16 +3106,17 @@ class IncrementalAstCloner implements AstVisitor<AstNode> { |
@override |
ExpressionStatement visitExpressionStatement(ExpressionStatement node) => |
- new ExpressionStatement( |
+ astFactory.expressionStatement( |
_cloneNode(node.expression), _mapToken(node.semicolon)); |
@override |
- ExtendsClause visitExtendsClause(ExtendsClause node) => new ExtendsClause( |
- _mapToken(node.extendsKeyword), _cloneNode(node.superclass)); |
+ ExtendsClause visitExtendsClause(ExtendsClause node) => |
+ astFactory.extendsClause( |
+ _mapToken(node.extendsKeyword), _cloneNode(node.superclass)); |
@override |
FieldDeclaration visitFieldDeclaration(FieldDeclaration node) => |
- new FieldDeclaration( |
+ astFactory.fieldDeclaration( |
_cloneNode(node.documentationComment), |
_cloneNodeList(node.metadata), |
_mapToken(node.staticKeyword), |
@@ -3110,7 +3125,7 @@ class IncrementalAstCloner implements AstVisitor<AstNode> { |
@override |
FieldFormalParameter visitFieldFormalParameter(FieldFormalParameter node) => |
- new FieldFormalParameter( |
+ astFactory.fieldFormalParameter( |
_cloneNode(node.documentationComment), |
_cloneNodeList(node.metadata), |
_mapToken(node.keyword), |
@@ -3125,7 +3140,7 @@ class IncrementalAstCloner implements AstVisitor<AstNode> { |
ForEachStatement visitForEachStatement(ForEachStatement node) { |
DeclaredIdentifier loopVariable = node.loopVariable; |
if (loopVariable == null) { |
- return new ForEachStatement.withReference( |
+ return astFactory.forEachStatementWithReference( |
_mapToken(node.awaitKeyword), |
_mapToken(node.forKeyword), |
_mapToken(node.leftParenthesis), |
@@ -3135,7 +3150,7 @@ class IncrementalAstCloner implements AstVisitor<AstNode> { |
_mapToken(node.rightParenthesis), |
_cloneNode(node.body)); |
} |
- return new ForEachStatement.withDeclaration( |
+ return astFactory.forEachStatementWithDeclaration( |
_mapToken(node.awaitKeyword), |
_mapToken(node.forKeyword), |
_mapToken(node.leftParenthesis), |
@@ -3148,7 +3163,7 @@ class IncrementalAstCloner implements AstVisitor<AstNode> { |
@override |
FormalParameterList visitFormalParameterList(FormalParameterList node) => |
- new FormalParameterList( |
+ astFactory.formalParameterList( |
_mapToken(node.leftParenthesis), |
_cloneNodeList(node.parameters), |
_mapToken(node.leftDelimiter), |
@@ -3156,7 +3171,7 @@ class IncrementalAstCloner implements AstVisitor<AstNode> { |
_mapToken(node.rightParenthesis)); |
@override |
- ForStatement visitForStatement(ForStatement node) => new ForStatement( |
+ ForStatement visitForStatement(ForStatement node) => astFactory.forStatement( |
_mapToken(node.forKeyword), |
_mapToken(node.leftParenthesis), |
_cloneNode(node.variables), |
@@ -3170,7 +3185,7 @@ class IncrementalAstCloner implements AstVisitor<AstNode> { |
@override |
FunctionDeclaration visitFunctionDeclaration(FunctionDeclaration node) => |
- new FunctionDeclaration( |
+ astFactory.functionDeclaration( |
_cloneNode(node.documentationComment), |
_cloneNodeList(node.metadata), |
_mapToken(node.externalKeyword), |
@@ -3182,11 +3197,12 @@ class IncrementalAstCloner implements AstVisitor<AstNode> { |
@override |
FunctionDeclarationStatement visitFunctionDeclarationStatement( |
FunctionDeclarationStatement node) => |
- new FunctionDeclarationStatement(_cloneNode(node.functionDeclaration)); |
+ astFactory |
+ .functionDeclarationStatement(_cloneNode(node.functionDeclaration)); |
@override |
FunctionExpression visitFunctionExpression(FunctionExpression node) { |
- FunctionExpression copy = new FunctionExpression( |
+ FunctionExpression copy = astFactory.functionExpression( |
_cloneNode(node.typeParameters), |
_cloneNode(node.parameters), |
_cloneNode(node.body)); |
@@ -3199,7 +3215,7 @@ class IncrementalAstCloner implements AstVisitor<AstNode> { |
@override |
FunctionExpressionInvocation visitFunctionExpressionInvocation( |
FunctionExpressionInvocation node) { |
- FunctionExpressionInvocation copy = new FunctionExpressionInvocation( |
+ FunctionExpressionInvocation copy = astFactory.functionExpressionInvocation( |
_cloneNode(node.function), |
_cloneNode(node.typeArguments), |
_cloneNode(node.argumentList)); |
@@ -3212,7 +3228,7 @@ class IncrementalAstCloner implements AstVisitor<AstNode> { |
@override |
FunctionTypeAlias visitFunctionTypeAlias(FunctionTypeAlias node) => |
- new FunctionTypeAlias( |
+ astFactory.functionTypeAlias( |
_cloneNode(node.documentationComment), |
_cloneNodeList(node.metadata), |
_mapToken(node.typedefKeyword), |
@@ -3225,7 +3241,7 @@ class IncrementalAstCloner implements AstVisitor<AstNode> { |
@override |
FunctionTypedFormalParameter visitFunctionTypedFormalParameter( |
FunctionTypedFormalParameter node) => |
- new FunctionTypedFormalParameter( |
+ astFactory.functionTypedFormalParameter( |
_cloneNode(node.documentationComment), |
_cloneNodeList(node.metadata), |
_cloneNode(node.returnType), |
@@ -3234,11 +3250,12 @@ class IncrementalAstCloner implements AstVisitor<AstNode> { |
_cloneNode(node.parameters)); |
@override |
- HideCombinator visitHideCombinator(HideCombinator node) => new HideCombinator( |
- _mapToken(node.keyword), _cloneNodeList(node.hiddenNames)); |
+ HideCombinator visitHideCombinator(HideCombinator node) => |
+ astFactory.hideCombinator( |
+ _mapToken(node.keyword), _cloneNodeList(node.hiddenNames)); |
@override |
- IfStatement visitIfStatement(IfStatement node) => new IfStatement( |
+ IfStatement visitIfStatement(IfStatement node) => astFactory.ifStatement( |
_mapToken(node.ifKeyword), |
_mapToken(node.leftParenthesis), |
_cloneNode(node.condition), |
@@ -3249,12 +3266,12 @@ class IncrementalAstCloner implements AstVisitor<AstNode> { |
@override |
ImplementsClause visitImplementsClause(ImplementsClause node) => |
- new ImplementsClause( |
+ astFactory.implementsClause( |
_mapToken(node.implementsKeyword), _cloneNodeList(node.interfaces)); |
@override |
ImportDirective visitImportDirective(ImportDirective node) { |
- ImportDirective copy = new ImportDirective( |
+ ImportDirective copy = astFactory.importDirective( |
_cloneNode(node.documentationComment), |
_cloneNodeList(node.metadata), |
_mapToken(node.keyword), |
@@ -3274,14 +3291,17 @@ class IncrementalAstCloner implements AstVisitor<AstNode> { |
Token period = _mapToken(node.period); |
IndexExpression copy; |
if (period == null) { |
- copy = new IndexExpression.forTarget( |
+ copy = astFactory.indexExpressionForTarget( |
_cloneNode(node.target), |
_mapToken(node.leftBracket), |
_cloneNode(node.index), |
_mapToken(node.rightBracket)); |
} else { |
- copy = new IndexExpression.forCascade(period, _mapToken(node.leftBracket), |
- _cloneNode(node.index), _mapToken(node.rightBracket)); |
+ copy = astFactory.indexExpressionForCascade( |
+ period, |
+ _mapToken(node.leftBracket), |
+ _cloneNode(node.index), |
+ _mapToken(node.rightBracket)); |
} |
copy.auxiliaryElements = node.auxiliaryElements; |
copy.propagatedElement = node.propagatedElement; |
@@ -3294,7 +3314,7 @@ class IncrementalAstCloner implements AstVisitor<AstNode> { |
@override |
InstanceCreationExpression visitInstanceCreationExpression( |
InstanceCreationExpression node) { |
- InstanceCreationExpression copy = new InstanceCreationExpression( |
+ InstanceCreationExpression copy = astFactory.instanceCreationExpression( |
_mapToken(node.keyword), |
_cloneNode(node.constructorName), |
_cloneNode(node.argumentList)); |
@@ -3307,7 +3327,7 @@ class IncrementalAstCloner implements AstVisitor<AstNode> { |
@override |
IntegerLiteral visitIntegerLiteral(IntegerLiteral node) { |
IntegerLiteral copy = |
- new IntegerLiteral(_mapToken(node.literal), node.value); |
+ astFactory.integerLiteral(_mapToken(node.literal), node.value); |
copy.propagatedType = node.propagatedType; |
copy.staticType = node.staticType; |
return copy; |
@@ -3316,16 +3336,16 @@ class IncrementalAstCloner implements AstVisitor<AstNode> { |
@override |
InterpolationExpression visitInterpolationExpression( |
InterpolationExpression node) => |
- new InterpolationExpression(_mapToken(node.leftBracket), |
+ astFactory.interpolationExpression(_mapToken(node.leftBracket), |
_cloneNode(node.expression), _mapToken(node.rightBracket)); |
@override |
InterpolationString visitInterpolationString(InterpolationString node) => |
- new InterpolationString(_mapToken(node.contents), node.value); |
+ astFactory.interpolationString(_mapToken(node.contents), node.value); |
@override |
IsExpression visitIsExpression(IsExpression node) { |
- IsExpression copy = new IsExpression( |
+ IsExpression copy = astFactory.isExpression( |
_cloneNode(node.expression), |
_mapToken(node.isOperator), |
_mapToken(node.notOperator), |
@@ -3337,16 +3357,16 @@ class IncrementalAstCloner implements AstVisitor<AstNode> { |
@override |
Label visitLabel(Label node) => |
- new Label(_cloneNode(node.label), _mapToken(node.colon)); |
+ astFactory.label(_cloneNode(node.label), _mapToken(node.colon)); |
@override |
LabeledStatement visitLabeledStatement(LabeledStatement node) => |
- new LabeledStatement( |
+ astFactory.labeledStatement( |
_cloneNodeList(node.labels), _cloneNode(node.statement)); |
@override |
LibraryDirective visitLibraryDirective(LibraryDirective node) { |
- LibraryDirective copy = new LibraryDirective( |
+ LibraryDirective copy = astFactory.libraryDirective( |
_cloneNode(node.documentationComment), |
_cloneNodeList(node.metadata), |
_mapToken(node.libraryKeyword), |
@@ -3359,7 +3379,7 @@ class IncrementalAstCloner implements AstVisitor<AstNode> { |
@override |
LibraryIdentifier visitLibraryIdentifier(LibraryIdentifier node) { |
LibraryIdentifier copy = |
- new LibraryIdentifier(_cloneNodeList(node.components)); |
+ astFactory.libraryIdentifier(_cloneNodeList(node.components)); |
copy.propagatedType = node.propagatedType; |
copy.staticType = node.staticType; |
return copy; |
@@ -3367,7 +3387,7 @@ class IncrementalAstCloner implements AstVisitor<AstNode> { |
@override |
ListLiteral visitListLiteral(ListLiteral node) { |
- ListLiteral copy = new ListLiteral( |
+ ListLiteral copy = astFactory.listLiteral( |
_mapToken(node.constKeyword), |
_cloneNode(node.typeArguments), |
_mapToken(node.leftBracket), |
@@ -3380,7 +3400,7 @@ class IncrementalAstCloner implements AstVisitor<AstNode> { |
@override |
MapLiteral visitMapLiteral(MapLiteral node) { |
- MapLiteral copy = new MapLiteral( |
+ MapLiteral copy = astFactory.mapLiteral( |
_mapToken(node.constKeyword), |
_cloneNode(node.typeArguments), |
_mapToken(node.leftBracket), |
@@ -3393,12 +3413,12 @@ class IncrementalAstCloner implements AstVisitor<AstNode> { |
@override |
MapLiteralEntry visitMapLiteralEntry(MapLiteralEntry node) => |
- new MapLiteralEntry(_cloneNode(node.key), _mapToken(node.separator), |
- _cloneNode(node.value)); |
+ astFactory.mapLiteralEntry(_cloneNode(node.key), |
+ _mapToken(node.separator), _cloneNode(node.value)); |
@override |
MethodDeclaration visitMethodDeclaration(MethodDeclaration node) => |
- new MethodDeclaration( |
+ astFactory.methodDeclaration( |
_cloneNode(node.documentationComment), |
_cloneNodeList(node.metadata), |
_mapToken(node.externalKeyword), |
@@ -3413,7 +3433,7 @@ class IncrementalAstCloner implements AstVisitor<AstNode> { |
@override |
MethodInvocation visitMethodInvocation(MethodInvocation node) { |
- MethodInvocation copy = new MethodInvocation( |
+ MethodInvocation copy = astFactory.methodInvocation( |
_cloneNode(node.target), |
_mapToken(node.operator), |
_cloneNode(node.methodName), |
@@ -3426,25 +3446,25 @@ class IncrementalAstCloner implements AstVisitor<AstNode> { |
@override |
NamedExpression visitNamedExpression(NamedExpression node) { |
- NamedExpression copy = |
- new NamedExpression(_cloneNode(node.name), _cloneNode(node.expression)); |
+ NamedExpression copy = astFactory.namedExpression( |
+ _cloneNode(node.name), _cloneNode(node.expression)); |
copy.propagatedType = node.propagatedType; |
copy.staticType = node.staticType; |
return copy; |
} |
@override |
- AstNode visitNativeClause(NativeClause node) => |
- new NativeClause(_mapToken(node.nativeKeyword), _cloneNode(node.name)); |
+ AstNode visitNativeClause(NativeClause node) => astFactory.nativeClause( |
+ _mapToken(node.nativeKeyword), _cloneNode(node.name)); |
@override |
NativeFunctionBody visitNativeFunctionBody(NativeFunctionBody node) => |
- new NativeFunctionBody(_mapToken(node.nativeKeyword), |
+ astFactory.nativeFunctionBody(_mapToken(node.nativeKeyword), |
_cloneNode(node.stringLiteral), _mapToken(node.semicolon)); |
@override |
NullLiteral visitNullLiteral(NullLiteral node) { |
- NullLiteral copy = new NullLiteral(_mapToken(node.literal)); |
+ NullLiteral copy = astFactory.nullLiteral(_mapToken(node.literal)); |
copy.propagatedType = node.propagatedType; |
copy.staticType = node.staticType; |
return copy; |
@@ -3453,7 +3473,7 @@ class IncrementalAstCloner implements AstVisitor<AstNode> { |
@override |
ParenthesizedExpression visitParenthesizedExpression( |
ParenthesizedExpression node) { |
- ParenthesizedExpression copy = new ParenthesizedExpression( |
+ ParenthesizedExpression copy = astFactory.parenthesizedExpression( |
_mapToken(node.leftParenthesis), |
_cloneNode(node.expression), |
_mapToken(node.rightParenthesis)); |
@@ -3464,7 +3484,7 @@ class IncrementalAstCloner implements AstVisitor<AstNode> { |
@override |
PartDirective visitPartDirective(PartDirective node) { |
- PartDirective copy = new PartDirective( |
+ PartDirective copy = astFactory.partDirective( |
_cloneNode(node.documentationComment), |
_cloneNodeList(node.metadata), |
_mapToken(node.partKeyword), |
@@ -3476,7 +3496,7 @@ class IncrementalAstCloner implements AstVisitor<AstNode> { |
@override |
PartOfDirective visitPartOfDirective(PartOfDirective node) { |
- PartOfDirective copy = new PartOfDirective( |
+ PartOfDirective copy = astFactory.partOfDirective( |
_cloneNode(node.documentationComment), |
_cloneNodeList(node.metadata), |
_mapToken(node.partKeyword), |
@@ -3490,7 +3510,7 @@ class IncrementalAstCloner implements AstVisitor<AstNode> { |
@override |
PostfixExpression visitPostfixExpression(PostfixExpression node) { |
- PostfixExpression copy = new PostfixExpression( |
+ PostfixExpression copy = astFactory.postfixExpression( |
_cloneNode(node.operand), _mapToken(node.operator)); |
copy.propagatedElement = node.propagatedElement; |
copy.propagatedType = node.propagatedType; |
@@ -3501,8 +3521,10 @@ class IncrementalAstCloner implements AstVisitor<AstNode> { |
@override |
PrefixedIdentifier visitPrefixedIdentifier(PrefixedIdentifier node) { |
- PrefixedIdentifier copy = new PrefixedIdentifier(_cloneNode(node.prefix), |
- _mapToken(node.period), _cloneNode(node.identifier)); |
+ PrefixedIdentifier copy = astFactory.prefixedIdentifier( |
+ _cloneNode(node.prefix), |
+ _mapToken(node.period), |
+ _cloneNode(node.identifier)); |
copy.propagatedType = node.propagatedType; |
copy.staticType = node.staticType; |
return copy; |
@@ -3510,7 +3532,7 @@ class IncrementalAstCloner implements AstVisitor<AstNode> { |
@override |
PrefixExpression visitPrefixExpression(PrefixExpression node) { |
- PrefixExpression copy = new PrefixExpression( |
+ PrefixExpression copy = astFactory.prefixExpression( |
_mapToken(node.operator), _cloneNode(node.operand)); |
copy.propagatedElement = node.propagatedElement; |
copy.propagatedType = node.propagatedType; |
@@ -3521,7 +3543,7 @@ class IncrementalAstCloner implements AstVisitor<AstNode> { |
@override |
PropertyAccess visitPropertyAccess(PropertyAccess node) { |
- PropertyAccess copy = new PropertyAccess(_cloneNode(node.target), |
+ PropertyAccess copy = astFactory.propertyAccess(_cloneNode(node.target), |
_mapToken(node.operator), _cloneNode(node.propertyName)); |
copy.propagatedType = node.propagatedType; |
copy.staticType = node.staticType; |
@@ -3532,7 +3554,7 @@ class IncrementalAstCloner implements AstVisitor<AstNode> { |
RedirectingConstructorInvocation visitRedirectingConstructorInvocation( |
RedirectingConstructorInvocation node) { |
RedirectingConstructorInvocation copy = |
- new RedirectingConstructorInvocation( |
+ astFactory.redirectingConstructorInvocation( |
_mapToken(node.thisKeyword), |
_mapToken(node.period), |
_cloneNode(node.constructorName), |
@@ -3544,7 +3566,7 @@ class IncrementalAstCloner implements AstVisitor<AstNode> { |
@override |
RethrowExpression visitRethrowExpression(RethrowExpression node) { |
RethrowExpression copy = |
- new RethrowExpression(_mapToken(node.rethrowKeyword)); |
+ astFactory.rethrowExpression(_mapToken(node.rethrowKeyword)); |
copy.propagatedType = node.propagatedType; |
copy.staticType = node.staticType; |
return copy; |
@@ -3552,21 +3574,21 @@ class IncrementalAstCloner implements AstVisitor<AstNode> { |
@override |
ReturnStatement visitReturnStatement(ReturnStatement node) => |
- new ReturnStatement(_mapToken(node.returnKeyword), |
+ astFactory.returnStatement(_mapToken(node.returnKeyword), |
_cloneNode(node.expression), _mapToken(node.semicolon)); |
@override |
ScriptTag visitScriptTag(ScriptTag node) => |
- new ScriptTag(_mapToken(node.scriptTag)); |
+ astFactory.scriptTag(_mapToken(node.scriptTag)); |
@override |
- ShowCombinator visitShowCombinator(ShowCombinator node) => new ShowCombinator( |
- _mapToken(node.keyword), _cloneNodeList(node.shownNames)); |
+ ShowCombinator visitShowCombinator(ShowCombinator node) => astFactory |
+ .showCombinator(_mapToken(node.keyword), _cloneNodeList(node.shownNames)); |
@override |
SimpleFormalParameter visitSimpleFormalParameter( |
SimpleFormalParameter node) => |
- new SimpleFormalParameter( |
+ astFactory.simpleFormalParameter( |
_cloneNode(node.documentationComment), |
_cloneNodeList(node.metadata), |
_mapToken(node.keyword), |
@@ -3584,7 +3606,7 @@ class IncrementalAstCloner implements AstVisitor<AstNode> { |
// documentation comments for the parser. |
mappedToken = node.token; |
} |
- SimpleIdentifier copy = new SimpleIdentifier(mappedToken, |
+ SimpleIdentifier copy = astFactory.simpleIdentifier(mappedToken, |
isDeclaration: node.inDeclarationContext()); |
copy.auxiliaryElements = node.auxiliaryElements; |
copy.propagatedElement = node.propagatedElement; |
@@ -3597,7 +3619,7 @@ class IncrementalAstCloner implements AstVisitor<AstNode> { |
@override |
SimpleStringLiteral visitSimpleStringLiteral(SimpleStringLiteral node) { |
SimpleStringLiteral copy = |
- new SimpleStringLiteral(_mapToken(node.literal), node.value); |
+ astFactory.simpleStringLiteral(_mapToken(node.literal), node.value); |
copy.propagatedType = node.propagatedType; |
copy.staticType = node.staticType; |
return copy; |
@@ -3606,7 +3628,7 @@ class IncrementalAstCloner implements AstVisitor<AstNode> { |
@override |
StringInterpolation visitStringInterpolation(StringInterpolation node) { |
StringInterpolation copy = |
- new StringInterpolation(_cloneNodeList(node.elements)); |
+ astFactory.stringInterpolation(_cloneNodeList(node.elements)); |
copy.propagatedType = node.propagatedType; |
copy.staticType = node.staticType; |
return copy; |
@@ -3615,7 +3637,7 @@ class IncrementalAstCloner implements AstVisitor<AstNode> { |
@override |
SuperConstructorInvocation visitSuperConstructorInvocation( |
SuperConstructorInvocation node) { |
- SuperConstructorInvocation copy = new SuperConstructorInvocation( |
+ SuperConstructorInvocation copy = astFactory.superConstructorInvocation( |
_mapToken(node.superKeyword), |
_mapToken(node.period), |
_cloneNode(node.constructorName), |
@@ -3626,14 +3648,15 @@ class IncrementalAstCloner implements AstVisitor<AstNode> { |
@override |
SuperExpression visitSuperExpression(SuperExpression node) { |
- SuperExpression copy = new SuperExpression(_mapToken(node.superKeyword)); |
+ SuperExpression copy = |
+ astFactory.superExpression(_mapToken(node.superKeyword)); |
copy.propagatedType = node.propagatedType; |
copy.staticType = node.staticType; |
return copy; |
} |
@override |
- SwitchCase visitSwitchCase(SwitchCase node) => new SwitchCase( |
+ SwitchCase visitSwitchCase(SwitchCase node) => astFactory.switchCase( |
_cloneNodeList(node.labels), |
_mapToken(node.keyword), |
_cloneNode(node.expression), |
@@ -3641,15 +3664,16 @@ class IncrementalAstCloner implements AstVisitor<AstNode> { |
_cloneNodeList(node.statements)); |
@override |
- SwitchDefault visitSwitchDefault(SwitchDefault node) => new SwitchDefault( |
- _cloneNodeList(node.labels), |
- _mapToken(node.keyword), |
- _mapToken(node.colon), |
- _cloneNodeList(node.statements)); |
+ SwitchDefault visitSwitchDefault(SwitchDefault node) => |
+ astFactory.switchDefault( |
+ _cloneNodeList(node.labels), |
+ _mapToken(node.keyword), |
+ _mapToken(node.colon), |
+ _cloneNodeList(node.statements)); |
@override |
SwitchStatement visitSwitchStatement(SwitchStatement node) => |
- new SwitchStatement( |
+ astFactory.switchStatement( |
_mapToken(node.switchKeyword), |
_mapToken(node.leftParenthesis), |
_cloneNode(node.expression), |
@@ -3660,7 +3684,7 @@ class IncrementalAstCloner implements AstVisitor<AstNode> { |
@override |
AstNode visitSymbolLiteral(SymbolLiteral node) { |
- SymbolLiteral copy = new SymbolLiteral( |
+ SymbolLiteral copy = astFactory.symbolLiteral( |
_mapToken(node.poundSign), _mapTokens(node.components)); |
copy.propagatedType = node.propagatedType; |
copy.staticType = node.staticType; |
@@ -3669,7 +3693,8 @@ class IncrementalAstCloner implements AstVisitor<AstNode> { |
@override |
ThisExpression visitThisExpression(ThisExpression node) { |
- ThisExpression copy = new ThisExpression(_mapToken(node.thisKeyword)); |
+ ThisExpression copy = |
+ astFactory.thisExpression(_mapToken(node.thisKeyword)); |
copy.propagatedType = node.propagatedType; |
copy.staticType = node.staticType; |
return copy; |
@@ -3677,7 +3702,7 @@ class IncrementalAstCloner implements AstVisitor<AstNode> { |
@override |
ThrowExpression visitThrowExpression(ThrowExpression node) { |
- ThrowExpression copy = new ThrowExpression( |
+ ThrowExpression copy = astFactory.throwExpression( |
_mapToken(node.throwKeyword), _cloneNode(node.expression)); |
copy.propagatedType = node.propagatedType; |
copy.staticType = node.staticType; |
@@ -3687,14 +3712,14 @@ class IncrementalAstCloner implements AstVisitor<AstNode> { |
@override |
TopLevelVariableDeclaration visitTopLevelVariableDeclaration( |
TopLevelVariableDeclaration node) => |
- new TopLevelVariableDeclaration( |
+ astFactory.topLevelVariableDeclaration( |
_cloneNode(node.documentationComment), |
_cloneNodeList(node.metadata), |
_cloneNode(node.variables), |
_mapToken(node.semicolon)); |
@override |
- TryStatement visitTryStatement(TryStatement node) => new TryStatement( |
+ TryStatement visitTryStatement(TryStatement node) => astFactory.tryStatement( |
_mapToken(node.tryKeyword), |
_cloneNode(node.body), |
_cloneNodeList(node.catchClauses), |
@@ -3703,39 +3728,40 @@ class IncrementalAstCloner implements AstVisitor<AstNode> { |
@override |
TypeArgumentList visitTypeArgumentList(TypeArgumentList node) => |
- new TypeArgumentList(_mapToken(node.leftBracket), |
+ astFactory.typeArgumentList(_mapToken(node.leftBracket), |
_cloneNodeList(node.arguments), _mapToken(node.rightBracket)); |
@override |
TypeName visitTypeName(TypeName node) { |
- TypeName copy = |
- new TypeName(_cloneNode(node.name), _cloneNode(node.typeArguments)); |
+ TypeName copy = astFactory.typeName( |
+ _cloneNode(node.name), _cloneNode(node.typeArguments)); |
copy.type = node.type; |
return copy; |
} |
@override |
- TypeParameter visitTypeParameter(TypeParameter node) => new TypeParameter( |
- _cloneNode(node.documentationComment), |
- _cloneNodeList(node.metadata), |
- _cloneNode(node.name), |
- _mapToken(node.extendsKeyword), |
- _cloneNode(node.bound)); |
+ TypeParameter visitTypeParameter(TypeParameter node) => |
+ astFactory.typeParameter( |
+ _cloneNode(node.documentationComment), |
+ _cloneNodeList(node.metadata), |
+ _cloneNode(node.name), |
+ _mapToken(node.extendsKeyword), |
+ _cloneNode(node.bound)); |
@override |
TypeParameterList visitTypeParameterList(TypeParameterList node) => |
- new TypeParameterList(_mapToken(node.leftBracket), |
+ astFactory.typeParameterList(_mapToken(node.leftBracket), |
_cloneNodeList(node.typeParameters), _mapToken(node.rightBracket)); |
@override |
VariableDeclaration visitVariableDeclaration(VariableDeclaration node) => |
- new VariableDeclaration(_cloneNode(node.name), _mapToken(node.equals), |
- _cloneNode(node.initializer)); |
+ astFactory.variableDeclaration(_cloneNode(node.name), |
+ _mapToken(node.equals), _cloneNode(node.initializer)); |
@override |
VariableDeclarationList visitVariableDeclarationList( |
VariableDeclarationList node) => |
- new VariableDeclarationList( |
+ astFactory.variableDeclarationList( |
null, |
_cloneNodeList(node.metadata), |
_mapToken(node.keyword), |
@@ -3745,27 +3771,29 @@ class IncrementalAstCloner implements AstVisitor<AstNode> { |
@override |
VariableDeclarationStatement visitVariableDeclarationStatement( |
VariableDeclarationStatement node) => |
- new VariableDeclarationStatement( |
+ astFactory.variableDeclarationStatement( |
_cloneNode(node.variables), _mapToken(node.semicolon)); |
@override |
- WhileStatement visitWhileStatement(WhileStatement node) => new WhileStatement( |
- _mapToken(node.whileKeyword), |
- _mapToken(node.leftParenthesis), |
- _cloneNode(node.condition), |
- _mapToken(node.rightParenthesis), |
- _cloneNode(node.body)); |
+ WhileStatement visitWhileStatement(WhileStatement node) => |
+ astFactory.whileStatement( |
+ _mapToken(node.whileKeyword), |
+ _mapToken(node.leftParenthesis), |
+ _cloneNode(node.condition), |
+ _mapToken(node.rightParenthesis), |
+ _cloneNode(node.body)); |
@override |
- WithClause visitWithClause(WithClause node) => new WithClause( |
+ WithClause visitWithClause(WithClause node) => astFactory.withClause( |
_mapToken(node.withKeyword), _cloneNodeList(node.mixinTypes)); |
@override |
- YieldStatement visitYieldStatement(YieldStatement node) => new YieldStatement( |
- _mapToken(node.yieldKeyword), |
- _mapToken(node.star), |
- _cloneNode(node.expression), |
- _mapToken(node.semicolon)); |
+ YieldStatement visitYieldStatement(YieldStatement node) => |
+ astFactory.yieldStatement( |
+ _mapToken(node.yieldKeyword), |
+ _mapToken(node.star), |
+ _cloneNode(node.expression), |
+ _mapToken(node.semicolon)); |
AstNode/*=E*/ _cloneNode/*<E extends AstNode>*/(AstNode/*=E*/ node) { |
if (node == null) { |