Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(668)

Side by Side Diff: pkg/analyzer/lib/src/dart/ast/ast.dart

Issue 1933763002: Use null-aware operators to clean up the code (Closed) Base URL: https://github.com/dart-lang/sdk.git@master
Patch Set: Additional clean-up Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « pkg/analyzer/lib/src/context/source.dart ('k') | pkg/analyzer/lib/src/dart/ast/utilities.dart » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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.ast; 5 library analyzer.src.dart.ast.ast;
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/token.dart'; 10 import 'package:analyzer/dart/ast/token.dart';
(...skipping 1752 matching lines...) Expand 10 before | Expand all | Expand 10 after
1763 ..add(_typeParameters) 1763 ..add(_typeParameters)
1764 ..add(_extendsClause) 1764 ..add(_extendsClause)
1765 ..add(_withClause) 1765 ..add(_withClause)
1766 ..add(_implementsClause) 1766 ..add(_implementsClause)
1767 ..add(_nativeClause) 1767 ..add(_nativeClause)
1768 ..add(leftBracket) 1768 ..add(leftBracket)
1769 ..addAll(members) 1769 ..addAll(members)
1770 ..add(rightBracket); 1770 ..add(rightBracket);
1771 1771
1772 @override 1772 @override
1773 ClassElement get element => 1773 ClassElement get element => _name?.staticElement as ClassElement;
1774 _name != null ? (_name.staticElement as ClassElement) : null;
1775 1774
1776 @override 1775 @override
1777 Token get endToken => rightBracket; 1776 Token get endToken => rightBracket;
1778 1777
1779 @override 1778 @override
1780 ExtendsClause get extendsClause => _extendsClause; 1779 ExtendsClause get extendsClause => _extendsClause;
1781 1780
1782 @override 1781 @override
1783 void set extendsClause(ExtendsClause extendsClause) { 1782 void set extendsClause(ExtendsClause extendsClause) {
1784 _extendsClause = _becomeParentOf(extendsClause); 1783 _extendsClause = _becomeParentOf(extendsClause);
(...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after
1987 ..add(_name) 1986 ..add(_name)
1988 ..add(_typeParameters) 1987 ..add(_typeParameters)
1989 ..add(equals) 1988 ..add(equals)
1990 ..add(abstractKeyword) 1989 ..add(abstractKeyword)
1991 ..add(_superclass) 1990 ..add(_superclass)
1992 ..add(_withClause) 1991 ..add(_withClause)
1993 ..add(_implementsClause) 1992 ..add(_implementsClause)
1994 ..add(semicolon); 1993 ..add(semicolon);
1995 1994
1996 @override 1995 @override
1997 ClassElement get element => 1996 ClassElement get element => _name?.staticElement as ClassElement;
1998 _name != null ? (_name.staticElement as ClassElement) : null;
1999 1997
2000 @override 1998 @override
2001 Token get firstTokenAfterCommentAndMetadata { 1999 Token get firstTokenAfterCommentAndMetadata {
2002 if (abstractKeyword != null) { 2000 if (abstractKeyword != null) {
2003 return abstractKeyword; 2001 return abstractKeyword;
2004 } 2002 }
2005 return typedefKeyword; 2003 return typedefKeyword;
2006 } 2004 }
2007 2005
2008 @override 2006 @override
(...skipping 1683 matching lines...) Expand 10 before | Expand all | Expand 10 after
3692 EnumConstantDeclarationImpl( 3690 EnumConstantDeclarationImpl(
3693 Comment comment, List<Annotation> metadata, SimpleIdentifier name) 3691 Comment comment, List<Annotation> metadata, SimpleIdentifier name)
3694 : super(comment, metadata) { 3692 : super(comment, metadata) {
3695 _name = _becomeParentOf(name); 3693 _name = _becomeParentOf(name);
3696 } 3694 }
3697 3695
3698 @override 3696 @override
3699 Iterable get childEntities => super._childEntities..add(_name); 3697 Iterable get childEntities => super._childEntities..add(_name);
3700 3698
3701 @override 3699 @override
3702 FieldElement get element => 3700 FieldElement get element => _name?.staticElement as FieldElement;
3703 _name == null ? null : (_name.staticElement as FieldElement);
3704 3701
3705 @override 3702 @override
3706 Token get endToken => _name.endToken; 3703 Token get endToken => _name.endToken;
3707 3704
3708 @override 3705 @override
3709 Token get firstTokenAfterCommentAndMetadata => _name.beginToken; 3706 Token get firstTokenAfterCommentAndMetadata => _name.beginToken;
3710 3707
3711 @override 3708 @override
3712 SimpleIdentifier get name => _name; 3709 SimpleIdentifier get name => _name;
3713 3710
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
3782 ..add(enumKeyword) 3779 ..add(enumKeyword)
3783 ..add(_name) 3780 ..add(_name)
3784 ..add(leftBracket) 3781 ..add(leftBracket)
3785 ..addAll(_constants) 3782 ..addAll(_constants)
3786 ..add(rightBracket); 3783 ..add(rightBracket);
3787 3784
3788 @override 3785 @override
3789 NodeList<EnumConstantDeclaration> get constants => _constants; 3786 NodeList<EnumConstantDeclaration> get constants => _constants;
3790 3787
3791 @override 3788 @override
3792 ClassElement get element => 3789 ClassElement get element => _name?.staticElement as ClassElement;
3793 _name != null ? (_name.staticElement as ClassElement) : null;
3794 3790
3795 @override 3791 @override
3796 Token get endToken => rightBracket; 3792 Token get endToken => rightBracket;
3797 3793
3798 @override 3794 @override
3799 Token get firstTokenAfterCommentAndMetadata => enumKeyword; 3795 Token get firstTokenAfterCommentAndMetadata => enumKeyword;
3800 3796
3801 @override 3797 @override
3802 dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) => 3798 dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
3803 visitor.visitEnumDeclaration(this); 3799 visitor.visitEnumDeclaration(this);
(...skipping 1188 matching lines...) Expand 10 before | Expand all | Expand 10 after
4992 4988
4993 @override 4989 @override
4994 Iterable get childEntities => super._childEntities 4990 Iterable get childEntities => super._childEntities
4995 ..add(externalKeyword) 4991 ..add(externalKeyword)
4996 ..add(_returnType) 4992 ..add(_returnType)
4997 ..add(propertyKeyword) 4993 ..add(propertyKeyword)
4998 ..add(_name) 4994 ..add(_name)
4999 ..add(_functionExpression); 4995 ..add(_functionExpression);
5000 4996
5001 @override 4997 @override
5002 ExecutableElement get element => 4998 ExecutableElement get element => _name?.staticElement as ExecutableElement;
5003 _name != null ? (_name.staticElement as ExecutableElement) : null;
5004 4999
5005 @override 5000 @override
5006 Token get endToken => _functionExpression.endToken; 5001 Token get endToken => _functionExpression.endToken;
5007 5002
5008 @override 5003 @override
5009 Token get firstTokenAfterCommentAndMetadata { 5004 Token get firstTokenAfterCommentAndMetadata {
5010 if (externalKeyword != null) { 5005 if (externalKeyword != null) {
5011 return externalKeyword; 5006 return externalKeyword;
5012 } else if (_returnType != null) { 5007 } else if (_returnType != null) {
5013 return _returnType.beginToken; 5008 return _returnType.beginToken;
(...skipping 330 matching lines...) Expand 10 before | Expand all | Expand 10 after
5344 Iterable get childEntities => super._childEntities 5339 Iterable get childEntities => super._childEntities
5345 ..add(typedefKeyword) 5340 ..add(typedefKeyword)
5346 ..add(_returnType) 5341 ..add(_returnType)
5347 ..add(_name) 5342 ..add(_name)
5348 ..add(_typeParameters) 5343 ..add(_typeParameters)
5349 ..add(_parameters) 5344 ..add(_parameters)
5350 ..add(semicolon); 5345 ..add(semicolon);
5351 5346
5352 @override 5347 @override
5353 FunctionTypeAliasElement get element => 5348 FunctionTypeAliasElement get element =>
5354 _name != null ? (_name.staticElement as FunctionTypeAliasElement) : null; 5349 _name?.staticElement as FunctionTypeAliasElement;
5355 5350
5356 @override 5351 @override
5357 FormalParameterList get parameters => _parameters; 5352 FormalParameterList get parameters => _parameters;
5358 5353
5359 @override 5354 @override
5360 void set parameters(FormalParameterList parameters) { 5355 void set parameters(FormalParameterList parameters) {
5361 _parameters = _becomeParentOf(parameters); 5356 _parameters = _becomeParentOf(parameters);
5362 } 5357 }
5363 5358
5364 @override 5359 @override
(...skipping 1708 matching lines...) Expand 10 before | Expand all | Expand 10 after
7073 ..add(_body); 7068 ..add(_body);
7074 7069
7075 /** 7070 /**
7076 * Return the element associated with this method, or `null` if the AST 7071 * Return the element associated with this method, or `null` if the AST
7077 * structure has not been resolved. The element can either be a 7072 * structure has not been resolved. The element can either be a
7078 * [MethodElement], if this represents the declaration of a normal method, or 7073 * [MethodElement], if this represents the declaration of a normal method, or
7079 * a [PropertyAccessorElement] if this represents the declaration of either a 7074 * a [PropertyAccessorElement] if this represents the declaration of either a
7080 * getter or a setter. 7075 * getter or a setter.
7081 */ 7076 */
7082 @override 7077 @override
7083 ExecutableElement get element => 7078 ExecutableElement get element => _name?.staticElement as ExecutableElement;
7084 _name != null ? (_name.staticElement as ExecutableElement) : null;
7085 7079
7086 @override 7080 @override
7087 Token get endToken => _body.endToken; 7081 Token get endToken => _body.endToken;
7088 7082
7089 @override 7083 @override
7090 Token get firstTokenAfterCommentAndMetadata { 7084 Token get firstTokenAfterCommentAndMetadata {
7091 if (externalKeyword != null) { 7085 if (externalKeyword != null) {
7092 return externalKeyword; 7086 return externalKeyword;
7093 } else if (modifierKeyword != null) { 7087 } else if (modifierKeyword != null) {
7094 return modifierKeyword; 7088 return modifierKeyword;
(...skipping 3233 matching lines...) Expand 10 before | Expand all | Expand 10 after
10328 void set bound(TypeName typeName) { 10322 void set bound(TypeName typeName) {
10329 _bound = _becomeParentOf(typeName); 10323 _bound = _becomeParentOf(typeName);
10330 } 10324 }
10331 10325
10332 @override 10326 @override
10333 Iterable get childEntities => 10327 Iterable get childEntities =>
10334 super._childEntities..add(_name)..add(extendsKeyword)..add(_bound); 10328 super._childEntities..add(_name)..add(extendsKeyword)..add(_bound);
10335 10329
10336 @override 10330 @override
10337 TypeParameterElement get element => 10331 TypeParameterElement get element =>
10338 _name != null ? (_name.staticElement as TypeParameterElement) : null; 10332 _name?.staticElement as TypeParameterElement;
10339 10333
10340 @override 10334 @override
10341 Token get endToken { 10335 Token get endToken {
10342 if (_bound == null) { 10336 if (_bound == null) {
10343 return _name.endToken; 10337 return _name.endToken;
10344 } 10338 }
10345 return _bound.endToken; 10339 return _bound.endToken;
10346 } 10340 }
10347 10341
10348 @override 10342 @override
(...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after
10585 if (comment == null) { 10579 if (comment == null) {
10586 AstNode node = parent?.parent; 10580 AstNode node = parent?.parent;
10587 if (node is AnnotatedNode) { 10581 if (node is AnnotatedNode) {
10588 return node.documentationComment; 10582 return node.documentationComment;
10589 } 10583 }
10590 } 10584 }
10591 return comment; 10585 return comment;
10592 } 10586 }
10593 10587
10594 @override 10588 @override
10595 VariableElement get element => 10589 VariableElement get element => _name?.staticElement as VariableElement;
10596 _name != null ? (_name.staticElement as VariableElement) : null;
10597 10590
10598 @override 10591 @override
10599 Token get endToken { 10592 Token get endToken {
10600 if (_initializer != null) { 10593 if (_initializer != null) {
10601 return _initializer.endToken; 10594 return _initializer.endToken;
10602 } 10595 }
10603 return _name.endToken; 10596 return _name.endToken;
10604 } 10597 }
10605 10598
10606 @override 10599 @override
(...skipping 386 matching lines...) Expand 10 before | Expand all | Expand 10 after
10993 10986
10994 @override 10987 @override
10995 dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) => 10988 dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
10996 visitor.visitYieldStatement(this); 10989 visitor.visitYieldStatement(this);
10997 10990
10998 @override 10991 @override
10999 void visitChildren(AstVisitor visitor) { 10992 void visitChildren(AstVisitor visitor) {
11000 _expression?.accept(visitor); 10993 _expression?.accept(visitor);
11001 } 10994 }
11002 } 10995 }
OLDNEW
« no previous file with comments | « pkg/analyzer/lib/src/context/source.dart ('k') | pkg/analyzer/lib/src/dart/ast/utilities.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698