Incremental resolution: rename function/constructor/method parameters.

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 15 matching lines @@
 
 main() {
   groupSep = ' | ';
   runReflectiveTests(DeclarationMatcherTest);
   runReflectiveTests(IncrementalResolverTest);
   runReflectiveTests(ResolutionContextBuilderTest);
 }
 
 
 class DeclarationMatcherTest extends ResolverTestCase {
-  void fail_test_methodDeclarationMatches_false_localVariable() {
-    // TODO(scheglov) as I understand DeclarationMatcher, we care only
-    // about externally visible model changes. So, because we analyze (at least
-    // right now) incremental changes on method level, local variable can be
-    // ignored.
-    _assertMethodMatches(false, r'''
-class C {
-  int m(int p) {
-    return p + p;
-  }
-}''', r'''
-class C {
-  int m(int p) {
-    int product = p * p;
-    return product + product;
-  }
-}''');
-  }
-
   void test_false_class_list_add() {
     _assertCompilationUnitMatches(false, r'''
 class A {}
 class B {}
 ''', r'''
 class A {}
 class B {}
 class C {}
 ''');
   }
@@ skipping 1018 matching lines @@
   }
 }
 
 
 class IncrementalResolverTest extends ResolverTestCase {
   Source source;
   String code;
   LibraryElement library;
   CompilationUnit unit;
 
-  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 fail_test_topLevelFunction_parameter_rename() {
-    // TODO(scheglov) Decide if incremental parser keeps the element
-    // of the function. If so, we can resolve parameter renames.
-    _resolveUnit(r'''
-int main(int a, int b) {
-  return a + b;
-}
-''');
-    _resolve(_editString(r'''(int a, int b) {
-  return a + b;''', r'''(int first, int b) {
-  return first + b;'''), _isDeclaration);
-  }
-
   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_add() {
+    _resolveUnit(r'''
+class A {
+  int f;
+  A(int a, int b);
+}''');
+    _resolve(_editString(');', ') : f = a + b;'), _isClassMember);
+  }
+
   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 test_constructor_superConstructorInvocation() {
     _resolveUnit(r'''
 class A {
   A(int p);
 }
-class A {
-  A(int a, int b) : super(a + b);
+class B extends A {
+  B(int a, int b) : super(a + b);
 }
 ''');
     _resolve(_editString('+', '*'), _isExpression);
   }
 
   void test_functionBody_body() {
     _resolveUnit(r'''
 main(int a, int b) {
   return a + b;
 }''');
@@ skipping 43 matching lines @@
     return a + b;
   }
 }
 ''');
     _resolve(_editString('    return a + b;', r'''
     int res = a + b;
     return res;
 '''), _isBlock);
   }
 
+  void test_method_parameter_rename() {
+    _resolveUnit(r'''
+class A {
+  int m(int a, int b, int c) {
+    return a + b + c;
+  }
+}
+''');
+    _resolve(_editString(r'''(int a, int b, int c) {
+    return a + b + c;''', r'''(int a, int second, int c) {
+    return a + second + c;'''), _isDeclaration);
+  }
+
   void test_topLevelFunction_label_add() {
     _resolveUnit(r'''
 int main(int a, int b) {
   return a + b;
 }
 ''');
     _resolve(_editString('  return', 'label: return a + b;'), _isBlock);
   }
 
   void test_topLevelFunction_label_remove() {
@@ skipping 20 matching lines @@
   void test_topLevelFunction_localVariable_remove() {
     _resolveUnit(r'''
 int main(int a, int b) {
   int res = a * b;
   return a + b;
 }
 ''');
     _resolve(_editString('int res = a * b;', ''), _isBlock);
   }
 
+  void test_topLevelFunction_parameter_rename() {
+    _resolveUnit(r'''
+int main(int a, int b) {
+  return a + b;
+}
+''');
+    _resolve(_editString(r'''(int a, int b) {
+  return a + b;''', r'''(int first, int b) {
+  return first + b;'''), _isDeclaration);
+  }
+
   void test_topLevelVariable_initializer() {
     _resolveUnit(r'''
 int C = 1 + 2;
 ''');
     _resolve(_editString('+', '*'), _isExpression);
   }
 
   void test_updateElementOffset() {
     _resolveUnit(r'''
 class A {
@@ skipping 32 matching lines @@
    * the incremental resolution and non-incremental resolutions are the same.
    */
   void _resolve(_Edit edit, Predicate<AstNode> predicate) {
     int offset = edit.offset;
     // parse "newCode"
     String newCode =
         code.substring(0, offset) +
         edit.replacement +
         code.substring(offset + edit.length);
     CompilationUnit newUnit = _parseUnit(newCode);
+    // update tokens
+    {
+      int delta = edit.replacement.length - edit.length;
+      _shiftTokens(unit.beginToken, offset, delta);
+    }
     // replace the node
     AstNode oldNode = _findNodeAt(unit, offset, predicate);
     AstNode newNode = _findNodeAt(newUnit, offset, predicate);
     bool success = NodeReplacer.replace(oldNode, newNode);
     expect(success, isTrue);
     // do incremental resolution
     GatheringErrorListener errorListener = new GatheringErrorListener();
     IncrementalResolver resolver = new IncrementalResolver(
         errorListener,
         typeProvider,
@@ skipping 41 matching lines @@
   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);
     return parser.parseCompilationUnit(token);
   }
+
+  static void _shiftTokens(Token token, int afterOffset, int delta) {
+    while (token.type != TokenType.EOF) {
+      if (token.offset >= afterOffset) {
+        token.applyDelta(delta);
+      }
+      token = token.next;
+    }
+  }
 }
 
 
 class ResolutionContextBuilderTest extends EngineTestCase {
   GatheringErrorListener listener = new GatheringErrorListener();
 
   void test_scopeFor_ClassDeclaration() {
     Scope scope = _scopeFor(_createResolvedClassDeclaration());
     EngineTestCase.assertInstanceOf(
         (obj) => obj is LibraryScope,
@@ skipping 987 matching lines @@
     _visitNode(node.expression, other.expression);
   }
 
   void _verifyElement(Element a, Element b) {
     if (a != b) {
       fail('Expected: $b\n  Actual: $a');
     }
     if (a == null && b == null) {
       return;
     }
-    expect(a.nameOffset, b.nameOffset);
+    if (a.nameOffset != b.nameOffset) {
+      fail('Expected: ${b.nameOffset}\n  Actual: ${a.nameOffset}');
+    }
   }
 
   void _verifyType(DartType a, DartType b) {
     expect(a, equals(b));
   }
 
   void _visitAnnotatedNode(AnnotatedNode node, AnnotatedNode other) {
     _visitNode(node.documentationComment, other.documentationComment);
     _visitList(node.metadata, other.metadata);
   }
@@ skipping 39 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);
   }
 }