| Index: tests/language_strong/rewrite_implicit_this_test.dart
|
| diff --git a/tests/language_strong/rewrite_implicit_this_test.dart b/tests/language_strong/rewrite_implicit_this_test.dart
|
| index 5d8166965392efd1ba02eb6e2ca01dc96d017f57..f4e24d243336c73fae5041c1e9c447a057031216 100644
|
| --- a/tests/language_strong/rewrite_implicit_this_test.dart
|
| +++ b/tests/language_strong/rewrite_implicit_this_test.dart
|
| @@ -10,30 +10,30 @@ class Foo {
|
| String x = 'x';
|
|
|
| easy(z) {
|
| - return x + y + z; /// 01: static type warning
|
| + return x + y + z; //# 01: static type warning
|
| }
|
|
|
| // Shadow the 'y' field in various ways
|
| shadow_y_parameter(y) {
|
| - return x + this.y + y; /// 01: continued
|
| + return x + this.y + y; //# 01: continued
|
| }
|
|
|
| shadow_y_local(z) {
|
| var y = z;
|
| - return x + this.y + y; /// 01: continued
|
| + return x + this.y + y; //# 01: continued
|
| }
|
|
|
| shadow_y_capturedLocal(z) {
|
| var y = z;
|
| foo() {
|
| - return x + this.y + y; /// 01: continued
|
| + return x + this.y + y; //# 01: continued
|
| }
|
| return foo();
|
| }
|
|
|
| shadow_y_closureParam(z) {
|
| foo(y) {
|
| - return x + this.y + y; /// 01: continued
|
| + return x + this.y + y; //# 01: continued
|
| }
|
| return foo(z);
|
| }
|
| @@ -41,32 +41,32 @@ class Foo {
|
| shadow_y_localInsideClosure(z) {
|
| foo() {
|
| var y = z;
|
| - return x + this.y + y; /// 01: continued
|
| + return x + this.y + y; //# 01: continued
|
| }
|
| return foo();
|
| }
|
|
|
| // Shadow the 'x' field in various ways
|
| shadow_x_parameter(x) {
|
| - return this.x + y + x; /// 01: continued
|
| + return this.x + y + x; //# 01: continued
|
| }
|
|
|
| shadow_x_local(z) {
|
| var x = z;
|
| - return this.x + y + x; /// 01: continued
|
| + return this.x + y + x; //# 01: continued
|
| }
|
|
|
| shadow_x_capturedLocal(z) {
|
| var x = z;
|
| foo() {
|
| - return this.x + y + x; /// 01: continued
|
| + return this.x + y + x; //# 01: continued
|
| }
|
| return foo();
|
| }
|
|
|
| shadow_x_closureParam(z) {
|
| foo(x) {
|
| - return this.x + y + x; /// 01: continued
|
| + return this.x + y + x; //# 01: continued
|
| }
|
| return foo(z);
|
| }
|
| @@ -74,13 +74,13 @@ class Foo {
|
| shadow_x_localInsideClosure(z) {
|
| foo() {
|
| var x = z;
|
| - return this.x + y + x; /// 01: continued
|
| + return this.x + y + x; //# 01: continued
|
| }
|
| return foo();
|
| }
|
|
|
| shadow_x_toplevel() {
|
| - return x + this.y + toplevel + this.toplevel; /// 01: continued
|
| + return x + this.y + toplevel + this.toplevel; //# 01: continued
|
| }
|
|
|
| }
|
| @@ -91,17 +91,17 @@ class Sub extends Foo {
|
| }
|
|
|
| main() {
|
| - Expect.equals('xyz', new Sub().easy('z')); /// 01: continued
|
| - Expect.equals('xyz', new Sub().shadow_y_parameter('z')); /// 01: continued
|
| - Expect.equals('xyz', new Sub().shadow_y_local('z')); /// 01: continued
|
| - Expect.equals('xyz', new Sub().shadow_y_capturedLocal('z')); /// 01: continued
|
| - Expect.equals('xyz', new Sub().shadow_y_closureParam('z')); /// 01: continued
|
| - Expect.equals('xyz', new Sub().shadow_y_localInsideClosure('z')); /// 01: continued
|
| - Expect.equals('xyz', new Sub().shadow_x_parameter('z')); /// 01: continued
|
| - Expect.equals('xyz', new Sub().shadow_x_local('z')); /// 01: continued
|
| - Expect.equals('xyz', new Sub().shadow_x_capturedLocal('z')); /// 01: continued
|
| - Expect.equals('xyz', new Sub().shadow_x_closureParam('z')); /// 01: continued
|
| - Expect.equals('xyz', new Sub().shadow_x_localInsideClosure('z')); /// 01: continued
|
| -
|
| - Expect.equals('xyAB', new Sub().shadow_x_toplevel()); /// 01: continued
|
| + Expect.equals('xyz', new Sub().easy('z')); //# 01: continued
|
| + Expect.equals('xyz', new Sub().shadow_y_parameter('z')); //# 01: continued
|
| + Expect.equals('xyz', new Sub().shadow_y_local('z')); //# 01: continued
|
| + Expect.equals('xyz', new Sub().shadow_y_capturedLocal('z')); //# 01: continued
|
| + Expect.equals('xyz', new Sub().shadow_y_closureParam('z')); //# 01: continued
|
| + Expect.equals('xyz', new Sub().shadow_y_localInsideClosure('z')); //# 01: continued
|
| + Expect.equals('xyz', new Sub().shadow_x_parameter('z')); //# 01: continued
|
| + Expect.equals('xyz', new Sub().shadow_x_local('z')); //# 01: continued
|
| + Expect.equals('xyz', new Sub().shadow_x_capturedLocal('z')); //# 01: continued
|
| + Expect.equals('xyz', new Sub().shadow_x_closureParam('z')); //# 01: continued
|
| + Expect.equals('xyz', new Sub().shadow_x_localInsideClosure('z')); //# 01: continued
|
| +
|
| + Expect.equals('xyAB', new Sub().shadow_x_toplevel()); //# 01: continued
|
| }
|
|
|