Incremental improvements in parameters and types matching.

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 248 matching lines @@
     _assertCompilationUnitMatches(false, r'''
 class A {
   A(int p) {}
 }
 ''', r'''
 class A {
 }
 ''');
   }
 
+  void test_false_defaultFieldFormalParameterElement_wasSimple() {
+    _assertCompilationUnitMatches(false, r'''
+class A {
+  int field;
+  A(int field);
+}
+''', r'''
+class A {
+  int field;
+  A([this.field = 0]);
+}
+''');
+  }
+
   void test_false_enum_constants_add() {
     resetWithEnum();
     _assertCompilationUnitMatches(false, r'''
 enum E {A, B}
 ''', r'''
 enum E {A, B, C}
 ''');
   }
 
   void test_false_enum_constants_remove() {
@@ skipping 194 matching lines @@
 class T {
   List<int> A;
 }
 ''', r'''
 class T {
   List<String> A;
 }
 ''');
   }
 
+  void test_false_fieldFormalParameterElement_wasSimple() {
+    _assertCompilationUnitMatches(false, r'''
+class A {
+  int field;
+  A(int field);
+}
+''', r'''
+class A {
+  int field;
+  A(this.field);
+}
+''');
+  }
+
   void test_false_final_type_different() {
     _assertCompilationUnitMatches(false, r'''
 class T {
   int A;
 }
 ''', r'''
 class T {
   String A;
 }
 ''');
@@ skipping 524 matching lines @@
 class A {
   A(int p);
 }
 ''', r'''
 class A {
   A(int p);
 }
 ''');
   }
 
+  void test_true_defaultFieldFormalParameterElement() {
+    _assertCompilationUnitMatches(true, r'''
+class A {
+  int field;
+  A([this.field = 0]);
+}
+''', r'''
+class A {
+  int field;
+  A([this.field = 0]);
+}
+''');
+  }
+
   void test_true_enum_constants_reorder() {
     resetWithEnum();
     _assertCompilationUnitMatches(true, r'''
 enum E {A, B, C}
 ''', r'''
 enum E {C, A, B}
 ''');
   }
 
   void test_true_enum_list_reorder() {
@@ skipping 117 matching lines @@
 }
 ''', r'''
 class T {
   int A = 1;
   int B = 2;
   int C = 3;
 }
 ''');
   }
 
+  void test_true_fieldFormalParameterElement() {
+    _assertCompilationUnitMatches(true, r'''
+class A {
+  int field;
+  A(this.field);
+}
+''', r'''
+class A {
+  int field;
+  A(this.field);
+}
+''');
+  }
+
   void test_true_implementsClause_same() {
     _assertCompilationUnitMatches(true, r'''
 class A {}
 class B implements A {}
 ''', r'''
 class A {}
 class B implements A {}
 ''');
   }
 
@@ skipping 210 matching lines @@
   }
 
   void test_true_topLevelVariable_type_sameArgs() {
     _assertCompilationUnitMatches(true, r'''
 Map<int, String> A;
 ''', r'''
 Map<int, String> A;
 ''');
   }
 
+  void test_true_type_dynamic() {
+    _assertCompilationUnitMatches(true, r'''
+dynamic a() {}
+''', r'''
+dynamic a() {}
+''');
+  }
+
+  void test_true_type_noTypeArguments_implyAllDynamic() {

[Brian Wilkerson, 2014/11/24 21:06:41]

Perhaps test some false cases for types, such as

class A<T> {}
A f() {}

and

class A<T> {}
A<int> f() {}

[scheglov, 2014/11/24 21:12:03]

Thank you.
Added.

+    _assertCompilationUnitMatches(true, r'''
+class A<T> {}
+A main() {
+}
+''', r'''
+class A<T> {}
+A main() {
+}
+''');
+  }
+
+  void test_true_type_void() {
+    _assertCompilationUnitMatches(true, r'''
+void a() {}
+''', r'''
+void a() {}
+''');
+  }
+
   void test_true_withClause_same() {
     _assertCompilationUnitMatches(true, r'''
 class A {}
 class B extends Object with A {}
 ''', r'''
 class A {}
 class B extends Object with A {}
 ''');
   }
 
@@ skipping 471 matching lines @@
       _resetWithIncremental(false);
       source = addSource(newCode);
       LibraryElement library = resolve(source);
       CompilationUnit fullNewUnit = resolveCompilationUnit(source, library);
       // Validate that "incremental" and "full" units have the same resolution.
       _SameResolutionValidator.assertSameResolution(newUnit, fullNewUnit);
       _assertEqualsTokens(newUnit, fullNewUnit);
     }
   }
 
+  static void _assertEqualsToken(Token incrToken, Token fullToken) {
+    expect(incrToken.type, fullToken.type);
+    expect(incrToken.offset, fullToken.offset);
+    expect(incrToken.length, fullToken.length);
+    expect(incrToken.lexeme, fullToken.lexeme);
+  }
+
   static void _assertEqualsTokens(CompilationUnit incrUnit,
       CompilationUnit fullUnit) {
     Token incrToken = incrUnit.beginToken;
     Token fullToken = fullUnit.beginToken;
     while (incrToken.type != TokenType.EOF && fullToken.type != TokenType.EOF) {
 //      print('$incrToken @ ${incrToken.offset}');
 //      print('$fullToken @ ${fullToken.offset}');
       _assertEqualsToken(incrToken, fullToken);
       incrToken = incrToken.next;
       fullToken = fullToken.next;
     }
   }
-
-  static void _assertEqualsToken(Token incrToken, Token fullToken) {
-    expect(incrToken.type, fullToken.type);
-    expect(incrToken.offset, fullToken.offset);
-    expect(incrToken.length, fullToken.length);
-    expect(incrToken.lexeme, fullToken.lexeme);
-  }
 }
 
 
 class ResolutionContextBuilderTest extends EngineTestCase {
   GatheringErrorListener listener = new GatheringErrorListener();
 
   void test_scopeFor_ClassDeclaration() {
     Scope scope = _scopeFor(_createResolvedClassDeclaration());
     EngineTestCase.assertInstanceOf(
         (obj) => obj is LibraryScope,
@@ skipping 1049 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);
   }
 }