More tests for expressions inside methods, constructors, initializers.

pkg/analyzer/test/generated/incremental_resolver_test.dart

 // Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library engine.incremental_resolver_test;
 
 import 'package:analyzer/src/generated/ast.dart';
 import 'package:analyzer/src/generated/element.dart';
 import 'package:analyzer/src/generated/engine.dart';
 import 'package:analyzer/src/generated/error.dart';
@@ skipping 828 matching lines @@
 main(int a, int b) {
   return a + b;
 }
 ''');
     _resolve(_editString('  return a + b;', r'''
   int res = a + b;
   return res;
 '''), _isBlock);
   }
 
+  void test_constructor_body() {
+    _resolveUnit(r'''
+class A {
+  int f;
+  A(int a, int b) {
+    f = a + b;
+  }
+}''');
+    _resolve(_editString('+', '*'), _isFunctionBody);
+  }
+
+  void test_constructor_fieldInitializer_edit() {
+    _resolveUnit(r'''
+class A {
+  int f;
+  A(int a, int b) : f = a + b {
+    int a = 42;
+  }
+}''');
+    _resolve(_editString('+', '*'), _isExpression);
+  }
+
+  void fail_test_constructor_fieldInitializer_add() {
+    // TODO(scheglov) resolver uses "enclosingClass", which we don't set yet
+    _resolveUnit(r'''
+class A {
+  int f;
+  A(int a, int b);
+}''');
+    _resolve(_editString(');', ') : f = a + b;'), _isClassMember);
+  }
+
+  void test_constructor_superConstructorInvocation() {
+    _resolveUnit(r'''
+class A {
+  A(int p);
+}
+class A {
+  A(int a, int b) : super(a + b);
+}
+''');
+    _resolve(_editString('+', '*'), _isExpression);
+  }
+
   void test_functionBody_body() {
     _resolveUnit(r'''
 main(int a, int b) {
   return a + b;
 }''');
     _resolve(_editString('+', '*'), _isFunctionBody);
   }
 
+  void test_functionBody_expression() {
+    _resolveUnit(r'''
+main(int a, int b) => a + b;
+''');
+    _resolve(_editString('+', '*'), _isExpression);
+  }
+
   void test_functionBody_statement() {
     _resolveUnit(r'''
 main(int a, int b) {
   return a + b;
 }''');
     _resolve(_editString('+', '*'), _isStatement);
   }
 
+  void test_method_body() {
+    _resolveUnit(r'''
+class A {
+  m(int a, int b) {
+    return a + b;
+  }
+}''');
+    _resolve(_editString('+', '*'), _isFunctionBody);
+  }
+
+  void test_topLevelVariable_initializer() {
+    _resolveUnit(r'''
+int C = 1 + 2;
+''');
+    _resolve(_editString('+', '*'), _isExpression);
+  }
+
   void test_updateElementOffset() {
     _resolveUnit(r'''
 class A {
   int am(String ap) {
     int av = 1;
     return av;
   }
 }
 main(int a, int b) {
   return a + b;
@@ skipping 68 matching lines @@
 
   static AstNode _findNodeAt(CompilationUnit oldUnit, int offset,
       Predicate<AstNode> predicate) {
     NodeLocator locator = new NodeLocator.con1(offset);
     AstNode node = locator.searchWithin(oldUnit);
     return node.getAncestor(predicate);
   }
 
   static bool _isBlock(AstNode node) => node is Block;
 
+  static bool _isExpression(AstNode node) => node is Expression;
+
+  static bool _isClassMember(AstNode node) => node is ClassMember;
+
   static bool _isFunctionBody(AstNode node) => node is FunctionBody;
 
   static bool _isStatement(AstNode node) => node is Statement;
 
   static CompilationUnit _parseUnit(String code) {
     var errorListener = new BooleanErrorListener();
     var reader = new CharSequenceReader(code);
     var scanner = new Scanner(null, reader, errorListener);
     var token = scanner.tokenize();
     var parser = new Parser(null, errorListener);
@@ skipping 1079 matching lines @@
     _visitList(node.metadata, other.metadata);
     _visitNode(node.identifier, other.identifier);
   }
 
   static void assertSameResolution(CompilationUnit actual,
       CompilationUnit expected) {
     _SameResolutionValidator validator = new _SameResolutionValidator(expected);
     actual.accept(validator);
   }
 }