Make IfStatementImpl use IfMixin.

scheglov · commit-bot@chromium.org · commit 2448445826b0 · 2019-03-06T02:19:54.000Z
R=brianwilkerson@google.com, paulberry@google.com Change-Id: I32f967a392a96692b6633f8ee62072404cdeaa11 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/95425 Reviewed-by: Brian Wilkerson <brianwilkerson@google.com> Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
diff --git a/pkg/analyzer/lib/src/dart/ast/ast.dart b/pkg/analyzer/lib/src/dart/ast/ast.dart
@@ -5644,6 +5644,7 @@ class IfElementImpl extends CollectionElementImpl
   Iterable<SyntacticEntity> get childEntities => new ChildEntities()
     ..addAll(super.childEntities)
     ..add(_thenElement)
+    ..add(elseKeyword)
     ..add(_elseElement);
 
   @override
@@ -5694,8 +5695,7 @@ mixin IfMixin on AstNodeImpl {
     ..add(ifKeyword)
     ..add(leftParenthesis)
     ..add(_condition)
-    ..add(rightParenthesis)
-    ..add(elseKeyword);
+    ..add(rightParenthesis);
 
   Expression get condition => _condition;
 
@@ -5713,46 +5713,32 @@ mixin IfMixin on AstNodeImpl {
 ///
 ///    ifStatement ::=
 ///        'if' '(' [Expression] ')' [Statement] ('else' [Statement])?
-class IfStatementImpl extends StatementImpl implements IfStatement {
-  /// The token representing the 'if' keyword.
-  @override
-  Token ifKeyword;
-
-  /// The left parenthesis.
-  @override
-  Token leftParenthesis;
-
-  /// The condition used to determine which of the statements is executed next.
-  ExpressionImpl _condition;
-
-  /// The right parenthesis.
-  @override
-  Token rightParenthesis;
-
+class IfStatementImpl extends StatementImpl
+    with IfMixin
+    implements IfStatement {
   /// The statement that is executed if the condition evaluates to `true`.
   StatementImpl _thenStatement;
 
-  /// The token representing the 'else' keyword, or `null` if there is no else
-  /// statement.
-  @override
-  Token elseKeyword;
-
   /// The statement that is executed if the condition evaluates to `false`, or
   /// `null` if there is no else statement.
   StatementImpl _elseStatement;
 
   /// Initialize a newly created if statement. The [elseKeyword] and
   /// [elseStatement] can be `null` if there is no else clause.
   IfStatementImpl(
-      this.ifKeyword,
-      this.leftParenthesis,
+      Token ifKeyword,
+      Token leftParenthesis,
       ExpressionImpl condition,
-      this.rightParenthesis,
+      Token rightParenthesis,
       StatementImpl thenStatement,
-      this.elseKeyword,
+      Token elseKeyword,
       StatementImpl elseStatement) {
+    this.ifKeyword = ifKeyword;
+    this.leftParenthesis = leftParenthesis;
     _condition = _becomeParentOf(condition);
+    this.rightParenthesis = rightParenthesis;
     _thenStatement = _becomeParentOf(thenStatement);
+    this.elseKeyword = elseKeyword;
     _elseStatement = _becomeParentOf(elseStatement);
   }
 
@@ -5761,22 +5747,11 @@ class IfStatementImpl extends StatementImpl implements IfStatement {
 
   @override
   Iterable<SyntacticEntity> get childEntities => new ChildEntities()
-    ..add(ifKeyword)
-    ..add(leftParenthesis)
-    ..add(_condition)
-    ..add(rightParenthesis)
+    ..addAll(super.childEntities)
     ..add(_thenStatement)
     ..add(elseKeyword)
     ..add(_elseStatement);
 
-  @override
-  Expression get condition => _condition;
-
-  @override
-  void set condition(Expression expression) {
-    _condition = _becomeParentOf(expression as ExpressionImpl);
-  }
-
   @override
   Statement get elseStatement => _elseStatement;
 
