| OLD | NEW |
| 1 // Copyright (c) 2014, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2014, the Dart project authors. Please see the AUTHORS file |
| 2 // for details. All rights reserved. Use of this source code is governed by a | 2 // for details. All rights reserved. Use of this source code is governed by a |
| 3 // BSD-style license that can be found in the LICENSE file. | 3 // BSD-style license that can be found in the LICENSE file. |
| 4 | 4 |
| 5 library analyzer.src.dart.ast.utilities; | 5 library analyzer.src.dart.ast.utilities; |
| 6 | 6 |
| 7 import 'dart:collection'; | 7 import 'dart:collection'; |
| 8 | 8 |
| 9 import 'package:analyzer/dart/ast/ast.dart'; | 9 import 'package:analyzer/dart/ast/ast.dart'; |
| 10 import 'package:analyzer/dart/ast/standard_ast_factory.dart'; | 10 import 'package:analyzer/dart/ast/standard_ast_factory.dart'; |
| (...skipping 426 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 437 cloneNodeList(node.metadata), | 437 cloneNodeList(node.metadata), |
| 438 cloneToken(node.staticKeyword), | 438 cloneToken(node.staticKeyword), |
| 439 cloneNode(node.fields), | 439 cloneNode(node.fields), |
| 440 cloneToken(node.semicolon)); | 440 cloneToken(node.semicolon)); |
| 441 | 441 |
| 442 @override | 442 @override |
| 443 FieldFormalParameter visitFieldFormalParameter(FieldFormalParameter node) => | 443 FieldFormalParameter visitFieldFormalParameter(FieldFormalParameter node) => |
| 444 astFactory.fieldFormalParameter( | 444 astFactory.fieldFormalParameter( |
| 445 cloneNode(node.documentationComment), | 445 cloneNode(node.documentationComment), |
| 446 cloneNodeList(node.metadata), | 446 cloneNodeList(node.metadata), |
| 447 cloneToken(node.covariantKeyword), | |
| 448 cloneToken(node.keyword), | 447 cloneToken(node.keyword), |
| 449 cloneNode(node.type), | 448 cloneNode(node.type), |
| 450 cloneToken(node.thisKeyword), | 449 cloneToken(node.thisKeyword), |
| 451 cloneToken(node.period), | 450 cloneToken(node.period), |
| 452 cloneNode(node.identifier), | 451 cloneNode(node.identifier), |
| 453 cloneNode(node.typeParameters), | 452 cloneNode(node.typeParameters), |
| 454 cloneNode(node.parameters)); | 453 cloneNode(node.parameters)); |
| 455 | 454 |
| 456 @override | 455 @override |
| 457 ForEachStatement visitForEachStatement(ForEachStatement node) { | 456 ForEachStatement visitForEachStatement(ForEachStatement node) { |
| (...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 539 cloneNode(node.typeParameters), | 538 cloneNode(node.typeParameters), |
| 540 cloneNode(node.parameters), | 539 cloneNode(node.parameters), |
| 541 cloneToken(node.semicolon)); | 540 cloneToken(node.semicolon)); |
| 542 | 541 |
| 543 @override | 542 @override |
| 544 FunctionTypedFormalParameter visitFunctionTypedFormalParameter( | 543 FunctionTypedFormalParameter visitFunctionTypedFormalParameter( |
| 545 FunctionTypedFormalParameter node) => | 544 FunctionTypedFormalParameter node) => |
| 546 astFactory.functionTypedFormalParameter( | 545 astFactory.functionTypedFormalParameter( |
| 547 cloneNode(node.documentationComment), | 546 cloneNode(node.documentationComment), |
| 548 cloneNodeList(node.metadata), | 547 cloneNodeList(node.metadata), |
| 549 cloneToken(node.covariantKeyword), | |
| 550 cloneNode(node.returnType), | 548 cloneNode(node.returnType), |
| 551 cloneNode(node.identifier), | 549 cloneNode(node.identifier), |
| 552 cloneNode(node.typeParameters), | 550 cloneNode(node.typeParameters), |
| 553 cloneNode(node.parameters)); | 551 cloneNode(node.parameters)); |
| 554 | 552 |
| 555 @override | 553 @override |
| 556 AstNode visitGenericFunctionType(GenericFunctionType node) => | 554 AstNode visitGenericFunctionType(GenericFunctionType node) => |
| 557 astFactory.genericFunctionType( | 555 astFactory.genericFunctionType( |
| 558 cloneNode(node.returnType), | 556 cloneNode(node.returnType), |
| 559 cloneToken(node.functionKeyword), | 557 cloneToken(node.functionKeyword), |
| (...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 813 @override | 811 @override |
| 814 ShowCombinator visitShowCombinator(ShowCombinator node) => astFactory | 812 ShowCombinator visitShowCombinator(ShowCombinator node) => astFactory |
| 815 .showCombinator(cloneToken(node.keyword), cloneNodeList(node.shownNames)); | 813 .showCombinator(cloneToken(node.keyword), cloneNodeList(node.shownNames)); |
| 816 | 814 |
| 817 @override | 815 @override |
| 818 SimpleFormalParameter visitSimpleFormalParameter( | 816 SimpleFormalParameter visitSimpleFormalParameter( |
| 819 SimpleFormalParameter node) => | 817 SimpleFormalParameter node) => |
| 820 astFactory.simpleFormalParameter( | 818 astFactory.simpleFormalParameter( |
| 821 cloneNode(node.documentationComment), | 819 cloneNode(node.documentationComment), |
| 822 cloneNodeList(node.metadata), | 820 cloneNodeList(node.metadata), |
| 823 cloneToken(node.covariantKeyword), | |
| 824 cloneToken(node.keyword), | 821 cloneToken(node.keyword), |
| 825 cloneNode(node.type), | 822 cloneNode(node.type), |
| 826 cloneNode(node.identifier)); | 823 cloneNode(node.identifier)); |
| 827 | 824 |
| 828 @override | 825 @override |
| 829 SimpleIdentifier visitSimpleIdentifier(SimpleIdentifier node) => | 826 SimpleIdentifier visitSimpleIdentifier(SimpleIdentifier node) => |
| 830 astFactory.simpleIdentifier(cloneToken(node.token), | 827 astFactory.simpleIdentifier(cloneToken(node.token), |
| 831 isDeclaration: node.inDeclarationContext()); | 828 isDeclaration: node.inDeclarationContext()); |
| 832 | 829 |
| 833 @override | 830 @override |
| (...skipping 2342 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3176 _cloneNodeList(node.metadata), | 3173 _cloneNodeList(node.metadata), |
| 3177 _mapToken(node.staticKeyword), | 3174 _mapToken(node.staticKeyword), |
| 3178 _cloneNode(node.fields), | 3175 _cloneNode(node.fields), |
| 3179 _mapToken(node.semicolon)); | 3176 _mapToken(node.semicolon)); |
| 3180 | 3177 |
| 3181 @override | 3178 @override |
| 3182 FieldFormalParameter visitFieldFormalParameter(FieldFormalParameter node) => | 3179 FieldFormalParameter visitFieldFormalParameter(FieldFormalParameter node) => |
| 3183 astFactory.fieldFormalParameter( | 3180 astFactory.fieldFormalParameter( |
| 3184 _cloneNode(node.documentationComment), | 3181 _cloneNode(node.documentationComment), |
| 3185 _cloneNodeList(node.metadata), | 3182 _cloneNodeList(node.metadata), |
| 3186 _mapToken(node.covariantKeyword), | |
| 3187 _mapToken(node.keyword), | 3183 _mapToken(node.keyword), |
| 3188 _cloneNode(node.type), | 3184 _cloneNode(node.type), |
| 3189 _mapToken(node.thisKeyword), | 3185 _mapToken(node.thisKeyword), |
| 3190 _mapToken(node.period), | 3186 _mapToken(node.period), |
| 3191 _cloneNode(node.identifier), | 3187 _cloneNode(node.identifier), |
| 3192 _cloneNode(node.typeParameters), | 3188 _cloneNode(node.typeParameters), |
| 3193 _cloneNode(node.parameters)); | 3189 _cloneNode(node.parameters)); |
| 3194 | 3190 |
| 3195 @override | 3191 @override |
| 3196 ForEachStatement visitForEachStatement(ForEachStatement node) { | 3192 ForEachStatement visitForEachStatement(ForEachStatement node) { |
| (...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3293 _cloneNode(node.typeParameters), | 3289 _cloneNode(node.typeParameters), |
| 3294 _cloneNode(node.parameters), | 3290 _cloneNode(node.parameters), |
| 3295 _mapToken(node.semicolon)); | 3291 _mapToken(node.semicolon)); |
| 3296 | 3292 |
| 3297 @override | 3293 @override |
| 3298 FunctionTypedFormalParameter visitFunctionTypedFormalParameter( | 3294 FunctionTypedFormalParameter visitFunctionTypedFormalParameter( |
| 3299 FunctionTypedFormalParameter node) => | 3295 FunctionTypedFormalParameter node) => |
| 3300 astFactory.functionTypedFormalParameter( | 3296 astFactory.functionTypedFormalParameter( |
| 3301 _cloneNode(node.documentationComment), | 3297 _cloneNode(node.documentationComment), |
| 3302 _cloneNodeList(node.metadata), | 3298 _cloneNodeList(node.metadata), |
| 3303 _mapToken(node.covariantKeyword), | |
| 3304 _cloneNode(node.returnType), | 3299 _cloneNode(node.returnType), |
| 3305 _cloneNode(node.identifier), | 3300 _cloneNode(node.identifier), |
| 3306 _cloneNode(node.typeParameters), | 3301 _cloneNode(node.typeParameters), |
| 3307 _cloneNode(node.parameters)); | 3302 _cloneNode(node.parameters)); |
| 3308 | 3303 |
| 3309 @override | 3304 @override |
| 3310 AstNode visitGenericFunctionType(GenericFunctionType node) => | 3305 AstNode visitGenericFunctionType(GenericFunctionType node) => |
| 3311 astFactory.genericFunctionType( | 3306 astFactory.genericFunctionType( |
| 3312 _cloneNode(node.returnType), | 3307 _cloneNode(node.returnType), |
| 3313 _mapToken(node.functionKeyword), | 3308 _mapToken(node.functionKeyword), |
| (...skipping 347 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3661 @override | 3656 @override |
| 3662 ShowCombinator visitShowCombinator(ShowCombinator node) => astFactory | 3657 ShowCombinator visitShowCombinator(ShowCombinator node) => astFactory |
| 3663 .showCombinator(_mapToken(node.keyword), _cloneNodeList(node.shownNames)); | 3658 .showCombinator(_mapToken(node.keyword), _cloneNodeList(node.shownNames)); |
| 3664 | 3659 |
| 3665 @override | 3660 @override |
| 3666 SimpleFormalParameter visitSimpleFormalParameter( | 3661 SimpleFormalParameter visitSimpleFormalParameter( |
| 3667 SimpleFormalParameter node) => | 3662 SimpleFormalParameter node) => |
| 3668 astFactory.simpleFormalParameter( | 3663 astFactory.simpleFormalParameter( |
| 3669 _cloneNode(node.documentationComment), | 3664 _cloneNode(node.documentationComment), |
| 3670 _cloneNodeList(node.metadata), | 3665 _cloneNodeList(node.metadata), |
| 3671 _mapToken(node.covariantKeyword), | |
| 3672 _mapToken(node.keyword), | 3666 _mapToken(node.keyword), |
| 3673 _cloneNode(node.type), | 3667 _cloneNode(node.type), |
| 3674 _cloneNode(node.identifier)); | 3668 _cloneNode(node.identifier)); |
| 3675 | 3669 |
| 3676 @override | 3670 @override |
| 3677 SimpleIdentifier visitSimpleIdentifier(SimpleIdentifier node) { | 3671 SimpleIdentifier visitSimpleIdentifier(SimpleIdentifier node) { |
| 3678 Token mappedToken = _mapToken(node.token); | 3672 Token mappedToken = _mapToken(node.token); |
| 3679 if (mappedToken == null) { | 3673 if (mappedToken == null) { |
| 3680 // This only happens for SimpleIdentifiers created by the parser as part | 3674 // This only happens for SimpleIdentifiers created by the parser as part |
| 3681 // of scanning documentation comments (the tokens for those identifiers | 3675 // of scanning documentation comments (the tokens for those identifiers |
| (...skipping 5687 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 9369 if (node.star != null) { | 9363 if (node.star != null) { |
| 9370 sink.write("yield* "); | 9364 sink.write("yield* "); |
| 9371 } else { | 9365 } else { |
| 9372 sink.write("yield "); | 9366 sink.write("yield "); |
| 9373 } | 9367 } |
| 9374 safelyVisitNode(node.expression); | 9368 safelyVisitNode(node.expression); |
| 9375 sink.write(";"); | 9369 sink.write(";"); |
| 9376 return null; | 9370 return null; |
| 9377 } | 9371 } |
| 9378 } | 9372 } |
| OLD | NEW |