diff --git a/pkg/analyzer/test/generated/simple_resolver_test.dart b/pkg/analyzer/test/generated/simple_resolver_test.dart index 8a04a29ab6a..7c7ffa81c40 100644 --- a/pkg/analyzer/test/generated/simple_resolver_test.dart +++ b/pkg/analyzer/test/generated/simple_resolver_test.dart @@ -514,7 +514,8 @@ class A { xParameter.declaredFragment!.element as FieldFormalParameterElement; expect(xParameterElement.field, result.findElement.field('x')); - assertResolvedNodeText(result.findNode.simple('x {}'), r''' + var node1 = result.findNode.simple('x {}'); + assertResolvedNodeText(node1, r''' SimpleIdentifier token: x element: ::@class::A::@constructor::new::@formalParameter::x @@ -575,7 +576,8 @@ class C extends B with M1, M2 { // Verify that the getter for "x" in C.f() refers to the getter defined in // M2. - assertResolvedNodeText(result.findNode.simple('x;'), r''' + var node2 = result.findNode.simple('x;'); + assertResolvedNodeText(node2, r''' SimpleIdentifier token: x element: ::@mixin::M2::@getter::x @@ -602,7 +604,8 @@ void main() { // Verify that the getter for "x" in "new C().x" refers to the getter // defined in M2. - assertResolvedNodeText(result.findNode.simple('x;'), r''' + var node3 = result.findNode.simple('x;'); + assertResolvedNodeText(node3, r''' SimpleIdentifier token: x element: ::@mixin::M2::@getter::x @@ -869,7 +872,8 @@ const A = null; expect(annotations, hasLength(1)); var cDeclaration = result.findNode.classDeclaration('C'); - assertResolvedNodeText(cDeclaration.metadata[0], r''' + var node = cDeclaration.metadata[0]; + assertResolvedNodeText(node, r''' Annotation atSign: @ name: SimpleIdentifier @@ -892,7 +896,8 @@ mixin E {} expect(annotations, hasLength(1)); var cDeclaration = result.findNode.classTypeAlias('C'); - assertResolvedNodeText(cDeclaration.metadata[0], r''' + var node = cDeclaration.metadata[0]; + assertResolvedNodeText(node, r''' Annotation atSign: @ name: SimpleIdentifier @@ -913,7 +918,8 @@ const A = null; expect(annotations, hasLength(1)); var eDeclaration = result.findNode.enumDeclaration('E'); - assertResolvedNodeText(eDeclaration.metadata[0], r''' + var node = eDeclaration.metadata[0]; + assertResolvedNodeText(node, r''' Annotation atSign: @ name: SimpleIdentifier @@ -933,7 +939,8 @@ const A = null; expect(annotations, hasLength(1)); var cDeclaration = result.findNode.extensionDeclaration('E'); - assertResolvedNodeText(cDeclaration.metadata[0], r''' + var node = cDeclaration.metadata[0]; + assertResolvedNodeText(node, r''' Annotation atSign: @ name: SimpleIdentifier @@ -988,7 +995,8 @@ const A = null; expect(annotations, hasLength(1)); var fDeclaration = result.findNode.functionDeclaration('f'); - assertResolvedNodeText(fDeclaration.metadata[0], r''' + var node = fDeclaration.metadata[0]; + assertResolvedNodeText(node, r''' Annotation atSign: @ name: SimpleIdentifier @@ -1009,7 +1017,8 @@ const A = null; expect(annotations, hasLength(1)); var fDeclaration = result.findNode.functionTypeAlias('F'); - assertResolvedNodeText(fDeclaration.metadata[0], r''' + var node = fDeclaration.metadata[0]; + assertResolvedNodeText(node, r''' Annotation atSign: @ name: SimpleIdentifier @@ -1038,7 +1047,8 @@ f(@A int p(int x)) {}'''); expect(annotations, hasLength(1)); var pDeclaration = result.findNode.formalParameter('p'); - assertResolvedNodeText(pDeclaration.metadata[0], r''' + var node = pDeclaration.metadata[0]; + assertResolvedNodeText(node, r''' Annotation atSign: @ name: SimpleIdentifier @@ -1059,7 +1069,8 @@ const A = null; expect(annotations, hasLength(1)); var fDeclaration = result.findNode.genericTypeAlias('F'); - assertResolvedNodeText(fDeclaration.metadata[0], r''' + var node = fDeclaration.metadata[0]; + assertResolvedNodeText(node, r''' Annotation atSign: @ name: SimpleIdentifier @@ -1101,7 +1112,8 @@ class C { expect(annotations, hasLength(1)); var mDeclaration = result.findNode.methodDeclaration('m'); - assertResolvedNodeText(mDeclaration.metadata[0], r''' + var node = mDeclaration.metadata[0]; + assertResolvedNodeText(node, r''' Annotation atSign: @ name: SimpleIdentifier @@ -1121,7 +1133,8 @@ const A = null; expect(annotations, hasLength(1)); var mDeclaration = result.findNode.mixinDeclaration('M'); - assertResolvedNodeText(mDeclaration.metadata[0], r''' + var node = mDeclaration.metadata[0]; + assertResolvedNodeText(node, r''' Annotation atSign: @ name: SimpleIdentifier @@ -1175,8 +1188,8 @@ const A = null; hasLength(1), ); - var annotation = result.findNode.annotation('@A'); - assertResolvedNodeText(annotation, r''' + var node = result.findNode.annotation('@A'); + assertResolvedNodeText(node, r''' Annotation atSign: @ name: SimpleIdentifier @@ -1217,7 +1230,8 @@ void main() { } '''); - assertResolvedNodeText(result.findNode.simple('f();'), r''' + var node4 = result.findNode.simple('f();'); + assertResolvedNodeText(node4, r''' SimpleIdentifier token: f element: ::@mixin::M2::@method::f @@ -1241,7 +1255,8 @@ class C extends B with M1, M2 { } '''); - assertResolvedNodeText(result.findNode.simple('f();'), r''' + var node5 = result.findNode.simple('f();'); + assertResolvedNodeText(node5, r''' SimpleIdentifier token: f element: ::@mixin::M2::@method::f @@ -1264,7 +1279,8 @@ void main() { } '''); - assertResolvedNodeText(result.findNode.simple('f();'), r''' + var node6 = result.findNode.simple('f();'); + assertResolvedNodeText(node6, r''' SimpleIdentifier token: f element: ::@mixin::M2::@method::f diff --git a/pkg/analyzer/test/generated/strong_mode_test.dart b/pkg/analyzer/test/generated/strong_mode_test.dart index 651ff25c4c6..cd072cff0da 100644 --- a/pkg/analyzer/test/generated/strong_mode_test.dart +++ b/pkg/analyzer/test/generated/strong_mode_test.dart @@ -5775,7 +5775,8 @@ main() { v = 3; v; // marker }'''); - assertResolvedNodeText(result.findNode.assignment('= 3'), r''' + var node = result.findNode.assignment('= 3'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: SimpleIdentifier token: v diff --git a/pkg/analyzer/test/src/dart/resolution/assignment_test.dart b/pkg/analyzer/test/src/dart/resolution/assignment_test.dart index 2311833575f..97fd3b0c58e 100644 --- a/pkg/analyzer/test/src/dart/resolution/assignment_test.dart +++ b/pkg/analyzer/test/src/dart/resolution/assignment_test.dart @@ -200,7 +200,8 @@ AssignmentExpression staticType: num '''); - assertResolvedNodeText(result.findNode.simple('a;'), r''' + var node2 = result.findNode.simple('a;'); + assertResolvedNodeText(node2, r''' SimpleIdentifier token: a element: ::@function::g::@formalParameter::a @@ -325,7 +326,8 @@ f(Object? o1, Object? o2, List listNum) { } '''); - assertResolvedNodeText(result.findNode.assignment('o1 ??= listNum'), r''' + var node = result.findNode.assignment('o1 ??= listNum'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: SimpleIdentifier token: o1 @@ -400,9 +402,8 @@ void f(A a) { } '''); - var assignment = result.findNode.assignment('[0] += 2'); - - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('[0] += 2'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: IndexExpression period: .. @@ -477,9 +478,8 @@ void f(A a) { } '''); - var assignment = result.findNode.assignment('[0] += 2'); - - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('[0] += 2'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: IndexExpression target: SimpleIdentifier @@ -520,9 +520,8 @@ void f(A a) { } '''); - var assignment = result.findNode.assignment('[0] += 2.0'); - - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('[0] += 2.0'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: IndexExpression target: SimpleIdentifier @@ -563,9 +562,8 @@ void f(A a) { } '''); - var assignment = result.findNode.assignment('[0] ??= 2'); - - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('[0] ??= 2'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: IndexExpression target: SimpleIdentifier @@ -605,9 +603,8 @@ void f(A a) { } '''); - var assignment = result.findNode.assignment('[0] = 2'); - - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('[0] = 2'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: IndexExpression target: SimpleIdentifier @@ -754,9 +751,8 @@ class B extends A { } '''); - var assignment = result.findNode.assignment('[0] += 2'); - - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('[0] += 2'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: IndexExpression target: SuperExpression @@ -796,9 +792,8 @@ class A { } '''); - var assignment = result.findNode.assignment('[0] += 2'); - - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('[0] += 2'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: IndexExpression target: ThisExpression @@ -837,9 +832,8 @@ void f(int c) { } '''); - var assignment = result.findNode.assignment('a[b] = c'); - - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('a[b] = c'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: IndexExpression target: SimpleIdentifier @@ -881,9 +875,8 @@ void f(int a, int c) { } '''); - var assignment = result.findNode.assignment('a[b] = c'); - - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('a[b] = c'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: IndexExpression target: SimpleIdentifier @@ -927,9 +920,8 @@ void f(A a, int c) { } '''); - var assignment = result.findNode.assignment('a[b] = c'); - - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('a[b] = c'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: IndexExpression target: SimpleIdentifier @@ -1056,9 +1048,8 @@ void f(int a, int b, double c) { } '''); - var assignment = result.findNode.assignment('= c'); - - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('= c'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: BinaryExpression leftOperand: SimpleIdentifier @@ -1099,9 +1090,8 @@ void f(int a, int b, double c) { } '''); - var assignment = result.findNode.assignment('= c'); - - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('= c'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: ParenthesizedExpression leftParenthesis: ( @@ -1224,9 +1214,8 @@ void f(num x, int y) { } '''); - var assignment = result.findNode.assignment('= y'); - - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('= y'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: PostfixExpression operand: SimpleIdentifier @@ -1265,9 +1254,8 @@ void f(num x, int y) { } '''); - var assignment = result.findNode.assignment('= y'); - - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('= y'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: PostfixExpression operand: SimpleIdentifier @@ -1306,9 +1294,8 @@ void f(num x, int y) { } '''); - var assignment = result.findNode.assignment('= y'); - - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('= y'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: PostfixExpression operand: SimpleIdentifier @@ -1347,9 +1334,8 @@ void f(num x, int y) { } '''); - var assignment = result.findNode.assignment('= y'); - - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('= y'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: PrefixExpression operator: ++ @@ -1388,9 +1374,8 @@ void f(num x, int y) { } '''); - var assignment = result.findNode.assignment('= y'); - - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('= y'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: PrefixExpression operator: ++ @@ -1429,9 +1414,8 @@ void f(num x, int y) { } '''); - var assignment = result.findNode.assignment('= y'); - - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('= y'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: PrefixExpression operator: ++ @@ -1473,9 +1457,8 @@ void f() { } '''); - var assignment = result.findNode.assignment('C = 0'); - - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('C = 0'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: SimpleIdentifier token: C @@ -1508,9 +1491,8 @@ void f() { } '''); - var assignment = result.findNode.assignment('C = 0'); - - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('C = 0'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: SimpleIdentifier token: C @@ -1580,9 +1562,8 @@ void f(A a) { } '''); - var assignment = result.findNode.assignment('x += 2'); - - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('x += 2'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: PrefixedIdentifier prefix: SimpleIdentifier @@ -1622,9 +1603,8 @@ void f(A a) { } '''); - var assignment = result.findNode.assignment('x ??= 2'); - - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('x ??= 2'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: PrefixedIdentifier prefix: SimpleIdentifier @@ -1663,9 +1643,8 @@ void f(A a) { } '''); - var assignment = result.findNode.assignment('x = 2'); - - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('x = 2'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: PrefixedIdentifier prefix: SimpleIdentifier @@ -1706,9 +1685,8 @@ void f(A a) { } '''); - var assignment = result.findNode.assignment('x = 2'); - - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('x = 2'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: PrefixedIdentifier prefix: SimpleIdentifier @@ -2186,9 +2164,8 @@ void f() { } '''); - var assignment = result.findNode.assignment('x = 2'); - - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('x = 2'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: PrefixedIdentifier prefix: SimpleIdentifier @@ -2229,9 +2206,8 @@ void f() { } '''); - var assignment = result.findNode.assignment('x = 2'); - - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('x = 2'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: PrefixedIdentifier prefix: SimpleIdentifier @@ -2272,9 +2248,8 @@ void f() { } '''); - var assignment = result.findNode.assignment('x += 2'); - - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('x += 2'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: PrefixedIdentifier prefix: SimpleIdentifier @@ -2316,9 +2291,8 @@ void f() { } '''); - var assignment = result.findNode.assignment('x += 2'); - - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('x += 2'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: PrefixedIdentifier prefix: SimpleIdentifier @@ -2355,9 +2329,8 @@ void f(int c) { } '''); - var assignment = result.findNode.assignment('a.b = c'); - - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('a.b = c'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: PrefixedIdentifier prefix: SimpleIdentifier @@ -2396,9 +2369,8 @@ void f(int a, int c) { } '''); - var assignment = result.findNode.assignment('a.b += c'); - - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('a.b += c'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: PrefixedIdentifier prefix: SimpleIdentifier @@ -2439,9 +2411,8 @@ void f(A a) { } '''); - var assignment = result.findNode.assignment('x += 2'); - - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('x += 2'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: PropertyAccess operator: .. @@ -2478,9 +2449,8 @@ main() { } '''); - var assignment = result.findNode.assignment('x = 1'); - - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('x = 1'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: PropertyAccess target: InstanceCreationExpression @@ -2527,9 +2497,8 @@ void f(A a) { } '''); - var assignment = result.findNode.assignment('x += 2'); - - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('x += 2'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: PropertyAccess target: ParenthesizedExpression @@ -2580,9 +2549,8 @@ void f(C c) { } '''); - var assignment = result.findNode.assignment('x += 2'); - - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('x += 2'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: PropertyAccess target: ParenthesizedExpression @@ -2625,9 +2593,8 @@ void f(A a) { } '''); - var assignment = result.findNode.assignment('x ??= 2'); - - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('x ??= 2'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: PropertyAccess target: ParenthesizedExpression @@ -2669,9 +2636,8 @@ void f(A a) { } '''); - var assignment = result.findNode.assignment('x = 2'); - - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('x = 2'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: PropertyAccess target: ParenthesizedExpression @@ -3980,9 +3946,8 @@ class B extends A { } '''); - var assignment = result.findNode.assignment('x += 2'); - - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('x += 2'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: PropertyAccess target: SuperExpression @@ -4020,9 +3985,8 @@ class A { } '''); - var assignment = result.findNode.assignment('x += 2'); - - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('x += 2'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: PropertyAccess target: ThisExpression @@ -4057,9 +4021,8 @@ void f(int c) { } '''); - var assignment = result.findNode.assignment('(a).b = c'); - - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('(a).b = c'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: PropertyAccess target: ParenthesizedExpression @@ -4100,9 +4063,8 @@ void f(int a, int c) { } '''); - var assignment = result.findNode.assignment('(a).b = c'); - - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('(a).b = c'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: PropertyAccess target: ParenthesizedExpression @@ -4176,9 +4138,8 @@ class C { } '''); - var assignment = result.findNode.assignment('x = 2'); - - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('x = 2'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: SimpleIdentifier token: x @@ -4209,9 +4170,8 @@ class C { } '''); - var assignment = result.findNode.assignment('x = 2'); - - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('x = 2'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: SimpleIdentifier token: x @@ -4244,9 +4204,8 @@ class C { } '''); - var assignment = result.findNode.assignment('x = 2'); - - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('x = 2'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: SimpleIdentifier token: x @@ -4279,9 +4238,8 @@ class C { } '''); - var assignment = result.findNode.assignment('x = 2'); - - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('x = 2'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: SimpleIdentifier token: x @@ -4312,9 +4270,8 @@ void f() { } '''); - var assignment = result.findNode.assignment('x = 2'); - - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('x = 2'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: SimpleIdentifier token: x @@ -4351,9 +4308,8 @@ class B extends A { } '''); - var assignment = result.findNode.assignment('x = 2'); - - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('x = 2'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: SimpleIdentifier token: x @@ -4384,9 +4340,8 @@ main() { } '''); - var assignment = result.findNode.assignment('x = 2'); - - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('x = 2'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: SimpleIdentifier token: x @@ -4415,9 +4370,8 @@ void f() { } '''); - var assignment = result.findNode.assignment('x += 3'); - - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('x += 3'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: SimpleIdentifier token: x @@ -4446,9 +4400,8 @@ void f() { } '''); - var assignment = result.findNode.assignment('x = 2'); - - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('x = 2'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: SimpleIdentifier token: x @@ -4479,9 +4432,8 @@ void f() { } '''); - var assignment = result.findNode.assignment('x = 2'); - - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('x = 2'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: SimpleIdentifier token: x @@ -4512,9 +4464,8 @@ void f() { } '''); - var assignment = result.findNode.assignment('x = 2'); - - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('x = 2'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: SimpleIdentifier token: x @@ -4541,9 +4492,8 @@ void f(num? x) { } '''); - var assignment = result.findNode.assignment('x ??='); - - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('x ??='); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: SimpleIdentifier token: x @@ -4576,9 +4526,8 @@ void f(B? x) { } '''); - var assignment = result.findNode.assignment('x ??='); - - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('x ??='); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: SimpleIdentifier token: x @@ -4615,9 +4564,8 @@ void f(double? a, int b) { } '''); - var assignment = result.findNode.assignment('a ??='); - - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('a ??='); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: SimpleIdentifier token: a @@ -4685,9 +4633,8 @@ void f(num x) { } '''); - var assignment = result.findNode.assignment('x = 2'); - - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('x = 2'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: SimpleIdentifier token: x @@ -4716,9 +4663,8 @@ void f(Object x) { } '''); - var assignment = result.findNode.assignment('x = 1'); - - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('x = 1'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: SimpleIdentifier token: x @@ -4747,9 +4693,8 @@ void f(int x) { } '''); - var assignment = result.findNode.assignment('x = true'); - - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('x = true'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: SimpleIdentifier token: x @@ -4779,9 +4724,8 @@ void f(final int x) { } '''); - var assignment = result.findNode.assignment('x = 2'); - - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('x = 2'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: SimpleIdentifier token: x @@ -4820,9 +4764,8 @@ class B extends A { } '''); - var assignment = result.findNode.assignment('x = 2'); - - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('x = 2'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: SimpleIdentifier token: x @@ -4861,9 +4804,8 @@ class B extends A { } '''); - var assignment = result.findNode.assignment('x = 2'); - - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('x = 2'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: SimpleIdentifier token: x @@ -4896,9 +4838,8 @@ class B extends A { } '''); - var assignment = result.findNode.assignment('x = 2'); - - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('x = 2'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: SimpleIdentifier token: x @@ -4927,9 +4868,8 @@ void f(int y) { } '''); - var assignment = result.findNode.assignment('= y'); - - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('= y'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: SimpleIdentifier token: @@ -4965,9 +4905,8 @@ class B extends A { } '''); - var assignment = result.findNode.assignment('x = 2'); - - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('x = 2'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: SimpleIdentifier token: x @@ -4999,9 +4938,8 @@ class C { } '''); - var assignment = result.findNode.assignment('x += 2'); - - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('x += 2'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: SimpleIdentifier token: x @@ -5040,9 +4978,8 @@ class C with M1, M2 { } '''); - var assignment = result.findNode.assignment('x += 2'); - - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('x += 2'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: SimpleIdentifier token: x @@ -5074,9 +5011,8 @@ class C { } '''); - var assignment = result.findNode.assignment('x ??= 2'); - - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('x ??= 2'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: SimpleIdentifier token: x @@ -5114,9 +5050,8 @@ class B extends A { } '''); - var assignment = result.findNode.assignment('x = 2'); - - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('x = 2'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: SimpleIdentifier token: x @@ -5146,9 +5081,8 @@ void f() { } '''); - var assignment = result.findNode.assignment('x += 2'); - - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('x += 2'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: SimpleIdentifier token: x @@ -5184,9 +5118,8 @@ B? get x => B(); set x(B? _) {} '''); - var assignment = result.findNode.assignment('x ??='); - - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('x ??='); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: SimpleIdentifier token: x @@ -5226,9 +5159,8 @@ class A { } '''); - var assignment = result.findNode.assignment('x += 2'); - - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('x += 2'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: SimpleIdentifier token: x @@ -5257,9 +5189,8 @@ void f() { } '''); - var assignment = result.findNode.assignment('x = 2'); - - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('x = 2'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: SimpleIdentifier token: x @@ -5290,9 +5221,8 @@ void f() { } '''); - var assignment = result.findNode.assignment('x = true'); - - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('x = true'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: SimpleIdentifier token: x @@ -5323,9 +5253,8 @@ void f() { } '''); - var assignment = result.findNode.assignment('x = 2'); - - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('x = 2'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: SimpleIdentifier token: x @@ -5354,9 +5283,8 @@ void f() { } '''); - var assignment = result.findNode.assignment('int += 3'); - - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('int += 3'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: SimpleIdentifier token: int @@ -5385,9 +5313,8 @@ void f() { } '''); - var assignment = result.findNode.assignment('int = 0'); - - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('int = 0'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: SimpleIdentifier token: int @@ -5416,9 +5343,8 @@ void f() { } '''); - var assignment = result.findNode.assignment('x += 1'); - - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('x += 1'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: SimpleIdentifier token: x @@ -5447,9 +5373,8 @@ void f(int a) { } '''); - var assignment = result.findNode.assignment('x = a'); - - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('x = a'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: SimpleIdentifier token: x @@ -5488,9 +5413,8 @@ f(Object? o, C2 c2) { } '''); - assertResolvedNodeText( - result.findNode.assignment('o ??= c2'), - r'''AssignmentExpression + var node = result.findNode.assignment('o ??= c2'); + assertResolvedNodeText(node, r'''AssignmentExpression leftHandSide: SimpleIdentifier token: o element: ::@function::f::@formalParameter::o @@ -5510,8 +5434,7 @@ f(Object? o, C2 c2) { writeType: Object? element: staticType: B1 -''', - ); +'''); } test_ifNull_contextNotUsedIfLhsDoesNotSatisfyContext() async { @@ -5523,9 +5446,8 @@ f(Object? o1, Object? o2, int? i) { } '''); - assertResolvedNodeText( - result.findNode.assignment('o2 ??= i'), - r'''AssignmentExpression + var node = result.findNode.assignment('o2 ??= i'); + assertResolvedNodeText(node, r'''AssignmentExpression leftHandSide: SimpleIdentifier token: o2 element: ::@function::f::@formalParameter::o2 @@ -5542,8 +5464,7 @@ f(Object? o1, Object? o2, int? i) { writeType: Object? element: staticType: num? -''', - ); +'''); } test_ifNull_contextUsedInsteadOfLubIfLubDoesNotSatisfyContext() async { @@ -5561,7 +5482,8 @@ f(Object? o, C2 c2) { } '''); - assertResolvedNodeText(result.findNode.assignment('o ??= c2'), r''' + var node = result.findNode.assignment('o ??= c2'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: SimpleIdentifier token: o diff --git a/pkg/analyzer/test/src/dart/resolution/ast_rewrite_test.dart b/pkg/analyzer/test/src/dart/resolution/ast_rewrite_test.dart index b175603c6dc..abf5560e18c 100644 --- a/pkg/analyzer/test/src/dart/resolution/ast_rewrite_test.dart +++ b/pkg/analyzer/test/src/dart/resolution/ast_rewrite_test.dart @@ -89,8 +89,8 @@ void Function() f(A a, bool b, C c, dynamic d) => b ? d : (b ? a : c); // `c` is in the "else" position of a conditional expression, so implicit // call tearoff logic should not apply to it. // Therefore the type of `b ? a : c` should be `A`. - var expr = result.findNode.conditionalExpression('b ? a : c'); - assertResolvedNodeText(expr, r''' + var node = result.findNode.conditionalExpression('b ? a : c'); + assertResolvedNodeText(node, r''' ConditionalExpression condition: SimpleIdentifier token: b @@ -121,8 +121,8 @@ void Function() f(A a, bool b, C c, dynamic d) => b ? d : (b ? c : a); // `c` is in the "then" position of a conditional expression, so implicit // call tearoff logic should not apply to it. // Therefore the type of `b ? c : a` should be `A`. - var expr = result.findNode.conditionalExpression('b ? c : a'); - assertResolvedNodeText(expr, r''' + var node = result.findNode.conditionalExpression('b ? c : a'); + assertResolvedNodeText(node, r''' ConditionalExpression condition: SimpleIdentifier token: b @@ -192,8 +192,8 @@ void Function() f(A a, bool b, C c, dynamic d) => b ? d : c ?? a; // `c` is on the LHS of an if-null expression, so implicit call tearoff // logic should not apply to it. // Therefore the type of `c ?? a` should be `A`. - var expr = result.findNode.binary('c ?? a'); - assertResolvedNodeText(expr, r''' + var node = result.findNode.binary('c ?? a'); + assertResolvedNodeText(node, r''' BinaryExpression leftOperand: SimpleIdentifier token: c diff --git a/pkg/analyzer/test/src/dart/resolution/binary_expression_test.dart b/pkg/analyzer/test/src/dart/resolution/binary_expression_test.dart index e04e7583aa4..de4a56046af 100644 --- a/pkg/analyzer/test/src/dart/resolution/binary_expression_test.dart +++ b/pkg/analyzer/test/src/dart/resolution/binary_expression_test.dart @@ -223,7 +223,8 @@ T f(T t) => t; int g() => f(null) ?? 0; '''); - assertResolvedNodeText(result.findNode.binary('?? 0'), r''' + var node = result.findNode.binary('?? 0'); + assertResolvedNodeText(node, r''' BinaryExpression leftOperand: MethodInvocation methodName: SimpleIdentifier @@ -270,7 +271,8 @@ f(C1? c1, C2 c2, Object? o) { } '''); - assertResolvedNodeText(result.findNode.binary('c1 ?? c2'), r''' + var node = result.findNode.binary('c1 ?? c2'); + assertResolvedNodeText(node, r''' BinaryExpression leftOperand: SimpleIdentifier token: c1 @@ -296,7 +298,8 @@ void f(int? x, int y) { } '''); - assertResolvedNodeText(result.findNode.binary('x ?? y'), r''' + var node = result.findNode.binary('x ?? y'); + assertResolvedNodeText(node, r''' BinaryExpression leftOperand: SimpleIdentifier token: x @@ -321,7 +324,8 @@ void f(int? x, double? y) { } '''); - assertResolvedNodeText(result.findNode.binary('x ?? y'), r''' + var node = result.findNode.binary('x ?? y'); + assertResolvedNodeText(node, r''' BinaryExpression leftOperand: SimpleIdentifier token: x @@ -346,7 +350,8 @@ void f(int? x) { } '''); - assertResolvedNodeText(result.findNode.binary('x ?? x'), r''' + var node = result.findNode.binary('x ?? x'); + assertResolvedNodeText(node, r''' BinaryExpression leftOperand: SimpleIdentifier token: x @@ -403,7 +408,8 @@ f(int a, Never b) { } '''); - assertResolvedNodeText(result.findNode.binary('a + b'), r''' + var node = result.findNode.binary('a + b'); + assertResolvedNodeText(node, r''' BinaryExpression leftOperand: SimpleIdentifier token: a @@ -432,7 +438,8 @@ f(Never a, int b) { } '''); - assertResolvedNodeText(result.findNode.binary('a + b'), r''' + var node = result.findNode.binary('a + b'); + assertResolvedNodeText(node, r''' BinaryExpression leftOperand: SimpleIdentifier token: a @@ -697,7 +704,8 @@ f(int a, int b) { } '''); - assertResolvedNodeText(result.findNode.binary('a != b'), r''' + var node = result.findNode.binary('a != b'); + assertResolvedNodeText(node, r''' BinaryExpression leftOperand: SimpleIdentifier token: a @@ -726,7 +734,8 @@ void f(int a) { } '''); - assertResolvedNodeText(result.findNode.binary('!= 0'), r''' + var node = result.findNode.binary('!= 0'); + assertResolvedNodeText(node, r''' BinaryExpression leftOperand: ExtensionOverride name: E @@ -762,7 +771,8 @@ f(int a, int b) { } '''); - assertResolvedNodeText(result.findNode.binary('a !== b'), r''' + var node = result.findNode.binary('a !== b'); + assertResolvedNodeText(node, r''' BinaryExpression leftOperand: SimpleIdentifier token: a @@ -816,7 +826,8 @@ void f(int a) { } '''); - assertResolvedNodeText(result.findNode.binary('== 0'), r''' + var node = result.findNode.binary('== 0'); + assertResolvedNodeText(node, r''' BinaryExpression leftOperand: ExtensionOverride name: E @@ -905,7 +916,8 @@ f(int a, int b) { } '''); - assertResolvedNodeText(result.findNode.binary('a === b'), r''' + var node = result.findNode.binary('a === b'); + assertResolvedNodeText(node, r''' BinaryExpression leftOperand: SimpleIdentifier token: a @@ -930,7 +942,8 @@ f(int? a, double b) { } '''); - assertResolvedNodeText(result.findNode.binary('a ?? b'), r''' + var node = result.findNode.binary('a ?? b'); + assertResolvedNodeText(node, r''' BinaryExpression leftOperand: SimpleIdentifier token: a @@ -955,7 +968,8 @@ f(bool a, bool b) { } '''); - assertResolvedNodeText(result.findNode.binary('a && b'), r''' + var node = result.findNode.binary('a && b'); + assertResolvedNodeText(node, r''' BinaryExpression leftOperand: SimpleIdentifier token: a @@ -980,7 +994,8 @@ f(bool a, bool b) { } '''); - assertResolvedNodeText(result.findNode.binary('a || b'), r''' + var node = result.findNode.binary('a || b'); + assertResolvedNodeText(node, r''' BinaryExpression leftOperand: SimpleIdentifier token: a @@ -1032,7 +1047,8 @@ f(int a, double b) { } '''); - assertResolvedNodeText(result.findNode.binary('a - b'), r''' + var node = result.findNode.binary('a - b'); + assertResolvedNodeText(node, r''' BinaryExpression leftOperand: SimpleIdentifier token: a @@ -1057,7 +1073,8 @@ f(int a, int b) { } '''); - assertResolvedNodeText(result.findNode.binary('a - b'), r''' + var node = result.findNode.binary('a - b'); + assertResolvedNodeText(node, r''' BinaryExpression leftOperand: SimpleIdentifier token: a @@ -1109,7 +1126,8 @@ f(int a, double b) { } '''); - assertResolvedNodeText(result.findNode.binary('a % b'), r''' + var node = result.findNode.binary('a % b'); + assertResolvedNodeText(node, r''' BinaryExpression leftOperand: SimpleIdentifier token: a @@ -1134,7 +1152,8 @@ f(int a, int b) { } '''); - assertResolvedNodeText(result.findNode.binary('a % b'), r''' + var node = result.findNode.binary('a % b'); + assertResolvedNodeText(node, r''' BinaryExpression leftOperand: SimpleIdentifier token: a @@ -1238,7 +1257,8 @@ f(double a, dynamic b) { a + b; } '''); - assertResolvedNodeText(result.findNode.binary('a + b'), r''' + var node = result.findNode.binary('a + b'); + assertResolvedNodeText(node, r''' BinaryExpression leftOperand: SimpleIdentifier token: a @@ -1396,7 +1416,8 @@ f(int a, double b) { a + b; } '''); - assertResolvedNodeText(result.findNode.binary('a + b'), r''' + var node = result.findNode.binary('a + b'); + assertResolvedNodeText(node, r''' BinaryExpression leftOperand: SimpleIdentifier token: a @@ -1420,7 +1441,8 @@ f(int a, dynamic b) { a + b; } '''); - assertResolvedNodeText(result.findNode.binary('a + b'), r''' + var node = result.findNode.binary('a + b'); + assertResolvedNodeText(node, r''' BinaryExpression leftOperand: SimpleIdentifier token: a @@ -1444,7 +1466,8 @@ f(int a, int b) { a + b; } '''); - assertResolvedNodeText(result.findNode.binary('a + b'), r''' + var node = result.findNode.binary('a + b'); + assertResolvedNodeText(node, r''' BinaryExpression leftOperand: SimpleIdentifier token: a @@ -1468,7 +1491,8 @@ f(int Function() a, int b) { a() + b; } '''); - assertResolvedNodeText(result.findNode.binary('a() + b'), r''' + var node = result.findNode.binary('a() + b'); + assertResolvedNodeText(node, r''' BinaryExpression leftOperand: FunctionExpressionInvocation function: SimpleIdentifier @@ -1502,7 +1526,8 @@ f(int a, int b) { E(a) + b; } '''); - assertResolvedNodeText(result.findNode.binary('E(a) + b'), r''' + var node = result.findNode.binary('E(a) + b'); + assertResolvedNodeText(node, r''' BinaryExpression leftOperand: ExtensionOverride name: E @@ -1536,7 +1561,8 @@ f(int a, num b) { a + b; } '''); - assertResolvedNodeText(result.findNode.binary('a + b'), r''' + var node = result.findNode.binary('a + b'); + assertResolvedNodeText(node, r''' BinaryExpression leftOperand: SimpleIdentifier token: a @@ -1564,7 +1590,8 @@ extension FooExtension on F { F get gg => this + 1; } '''); - assertResolvedNodeText(result.findNode.binary('this + 1'), r''' + var node = result.findNode.binary('this + 1'); + assertResolvedNodeText(node, r''' BinaryExpression leftOperand: ThisExpression thisKeyword: this @@ -1745,7 +1772,8 @@ f(A a, double b) { } '''); - assertResolvedNodeText(result.findNode.binary('a + b'), r''' + var node = result.findNode.binary('a + b'); + assertResolvedNodeText(node, r''' BinaryExpression leftOperand: SimpleIdentifier token: a @@ -1774,7 +1802,8 @@ f(A a, int b) { } '''); - assertResolvedNodeText(result.findNode.binary('E(a) + b'), r''' + var node = result.findNode.binary('E(a) + b'); + assertResolvedNodeText(node, r''' BinaryExpression leftOperand: ExtensionOverride name: E @@ -1813,7 +1842,8 @@ f(A a, int b) { } '''); - assertResolvedNodeText(result.findNode.binary('a + b'), r''' + var node = result.findNode.binary('a + b'); + assertResolvedNodeText(node, r''' BinaryExpression leftOperand: SimpleIdentifier token: a @@ -1838,7 +1868,8 @@ f(T a) { } '''); - assertResolvedNodeText(result.findNode.binary('a + 0'), r''' + var node = result.findNode.binary('a + 0'); + assertResolvedNodeText(node, r''' BinaryExpression leftOperand: SimpleIdentifier token: a @@ -1862,7 +1893,8 @@ f(T a) { } '''); - assertResolvedNodeText(result.findNode.binary('a + 0'), r''' + var node = result.findNode.binary('a + 0'); + assertResolvedNodeText(node, r''' BinaryExpression leftOperand: SimpleIdentifier token: a @@ -1886,7 +1918,8 @@ f(int a, int b) { } '''); - assertResolvedNodeText(result.findNode.binary('a / b'), r''' + var node = result.findNode.binary('a / b'); + assertResolvedNodeText(node, r''' BinaryExpression leftOperand: SimpleIdentifier token: a @@ -1938,7 +1971,8 @@ f(int a, double b) { } '''); - assertResolvedNodeText(result.findNode.binary('a * b'), r''' + var node = result.findNode.binary('a * b'); + assertResolvedNodeText(node, r''' BinaryExpression leftOperand: SimpleIdentifier token: a @@ -1963,7 +1997,8 @@ f(int a, int b) { } '''); - assertResolvedNodeText(result.findNode.binary('a * b'), r''' + var node = result.findNode.binary('a * b'); + assertResolvedNodeText(node, r''' BinaryExpression leftOperand: SimpleIdentifier token: a @@ -1997,9 +2032,8 @@ f(C1? c1, C2 c2) { } '''); - assertResolvedNodeText( - result.findNode.binary('c1 ?? c2'), - r'''BinaryExpression + var node = result.findNode.binary('c1 ?? c2'); + assertResolvedNodeText(node, r'''BinaryExpression leftOperand: SimpleIdentifier token: c1 element: ::@function::f::@formalParameter::c1 @@ -2016,8 +2050,7 @@ f(C1? c1, C2 c2) { element: staticInvokeType: null staticType: B1 -''', - ); +'''); } test_ifNull_contextNotUsedIfLhsDoesNotSatisfyContext() async { @@ -2034,9 +2067,8 @@ f(B2? b2, C1 c1, Object? o) { } '''); - assertResolvedNodeText( - result.findNode.binary('b2 ?? c1'), - r'''BinaryExpression + var node = result.findNode.binary('b2 ?? c1'); + assertResolvedNodeText(node, r'''BinaryExpression leftOperand: SimpleIdentifier token: b2 element: ::@function::f::@formalParameter::b2 @@ -2051,8 +2083,7 @@ f(B2? b2, C1 c1, Object? o) { element: staticInvokeType: null staticType: B2 -''', - ); +'''); } test_ifNull_contextNotUsedIfRhsDoesNotSatisfyContext() async { @@ -2069,9 +2100,8 @@ f(C1? c1, B2 b2, Object? o) { } '''); - assertResolvedNodeText( - result.findNode.binary('c1 ?? b2'), - r'''BinaryExpression + var node = result.findNode.binary('c1 ?? b2'); + assertResolvedNodeText(node, r'''BinaryExpression leftOperand: SimpleIdentifier token: c1 element: ::@function::f::@formalParameter::c1 @@ -2086,8 +2116,7 @@ f(C1? c1, B2 b2, Object? o) { element: staticInvokeType: null staticType: B2 -''', - ); +'''); } test_ifNull_contextUsedInsteadOfLubIfLubDoesNotSatisfyContext() async { @@ -2100,7 +2129,8 @@ class C2 implements B1, B2 {} B1 f(C1? c1, C2 c2) => c1 ?? c2; '''); - assertResolvedNodeText(result.findNode.binary('c1 ?? c2'), r''' + var node = result.findNode.binary('c1 ?? c2'); + assertResolvedNodeText(node, r''' BinaryExpression leftOperand: SimpleIdentifier token: c1 diff --git a/pkg/analyzer/test/src/dart/resolution/comment_test.dart b/pkg/analyzer/test/src/dart/resolution/comment_test.dart index 4d30f90f6bb..1f152de7179 100644 --- a/pkg/analyzer/test/src/dart/resolution/comment_test.dart +++ b/pkg/analyzer/test/src/dart/resolution/comment_test.dart @@ -32,7 +32,8 @@ class A { void f() {} '''); - assertResolvedNodeText(result.findNode.commentReference('A.named]'), r''' + var node = result.findNode.commentReference('A.named]'); + assertResolvedNodeText(node, r''' CommentReference expression: PrefixedIdentifier prefix: SimpleIdentifier @@ -59,7 +60,8 @@ class A { void f() {} '''); - assertResolvedNodeText(result.findNode.commentReference('A.new]'), r''' + var node = result.findNode.commentReference('A.new]'); + assertResolvedNodeText(node, r''' CommentReference expression: PrefixedIdentifier prefix: SimpleIdentifier @@ -86,7 +88,8 @@ class A { void f() {} '''); - assertResolvedNodeText(result.findNode.commentReference('A.foo]'), r''' + var node = result.findNode.commentReference('A.foo]'); + assertResolvedNodeText(node, r''' CommentReference expression: PrefixedIdentifier prefix: SimpleIdentifier @@ -114,7 +117,8 @@ typedef B = A; void f() {} '''); - assertResolvedNodeText(result.findNode.commentReference('B.foo]'), r''' + var node = result.findNode.commentReference('B.foo]'); + assertResolvedNodeText(node, r''' CommentReference expression: PrefixedIdentifier prefix: SimpleIdentifier @@ -141,7 +145,8 @@ class A { void f() {} '''); - assertResolvedNodeText(result.findNode.commentReference('A.foo]'), r''' + var node = result.findNode.commentReference('A.foo]'); + assertResolvedNodeText(node, r''' CommentReference expression: PrefixedIdentifier prefix: SimpleIdentifier @@ -168,7 +173,8 @@ class A { void f() {} '''); - assertResolvedNodeText(result.findNode.commentReference('A.foo]'), r''' + var node = result.findNode.commentReference('A.foo]'); + assertResolvedNodeText(node, r''' CommentReference expression: PrefixedIdentifier prefix: SimpleIdentifier @@ -199,7 +205,8 @@ extension E2 on A { } '''); - assertResolvedNodeText(result.findNode.commentReference('foo]'), r''' + var node = result.findNode.commentReference('foo]'); + assertResolvedNodeText(node, r''' CommentReference expression: SimpleIdentifier token: foo @@ -214,7 +221,8 @@ CommentReference class A {} '''); - assertResolvedNodeText(result.findNode.commentReference('foo]'), r''' + var node = result.findNode.commentReference('foo]'); + assertResolvedNodeText(node, r''' CommentReference expression: SimpleIdentifier token: foo @@ -233,7 +241,8 @@ class A { void f() {} '''); - assertResolvedNodeText(result.findNode.commentReference('A.foo]'), r''' + var node = result.findNode.commentReference('A.foo]'); + assertResolvedNodeText(node, r''' CommentReference expression: PrefixedIdentifier prefix: SimpleIdentifier @@ -262,7 +271,8 @@ typedef B = A; void f() {} '''); - assertResolvedNodeText(result.findNode.commentReference('B.foo]'), r''' + var node = result.findNode.commentReference('B.foo]'); + assertResolvedNodeText(node, r''' CommentReference expression: PrefixedIdentifier prefix: SimpleIdentifier @@ -289,7 +299,8 @@ class A { void f() {} '''); - assertResolvedNodeText(result.findNode.commentReference('A.foo]'), r''' + var node = result.findNode.commentReference('A.foo]'); + assertResolvedNodeText(node, r''' CommentReference expression: PrefixedIdentifier prefix: SimpleIdentifier @@ -316,7 +327,8 @@ class A { void f() {} '''); - assertResolvedNodeText(result.findNode.commentReference('A.foo]'), r''' + var node = result.findNode.commentReference('A.foo]'); + assertResolvedNodeText(node, r''' CommentReference expression: PrefixedIdentifier prefix: SimpleIdentifier @@ -347,7 +359,8 @@ library; void f() {} '''); - assertResolvedNodeText(result.findNode.commentReference('A.named]'), r''' + var node = result.findNode.commentReference('A.named]'); + assertResolvedNodeText(node, r''' CommentReference expression: PrefixedIdentifier prefix: SimpleIdentifier @@ -378,7 +391,8 @@ library; void f() {} '''); - assertResolvedNodeText(result.findNode.commentReference('A.new]'), r''' + var node = result.findNode.commentReference('A.new]'); + assertResolvedNodeText(node, r''' CommentReference expression: PrefixedIdentifier prefix: SimpleIdentifier @@ -409,7 +423,8 @@ library; void f() {} '''); - assertResolvedNodeText(result.findNode.commentReference('A.foo]'), r''' + var node = result.findNode.commentReference('A.foo]'); + assertResolvedNodeText(node, r''' CommentReference expression: PrefixedIdentifier prefix: SimpleIdentifier @@ -440,7 +455,8 @@ library; void f() {} '''); - assertResolvedNodeText(result.findNode.commentReference('A.foo]'), r''' + var node = result.findNode.commentReference('A.foo]'); + assertResolvedNodeText(node, r''' CommentReference expression: PrefixedIdentifier prefix: SimpleIdentifier @@ -471,7 +487,8 @@ library; void f() {} '''); - assertResolvedNodeText(result.findNode.commentReference('A.foo]'), r''' + var node = result.findNode.commentReference('A.foo]'); + assertResolvedNodeText(node, r''' CommentReference expression: PrefixedIdentifier prefix: SimpleIdentifier @@ -502,7 +519,8 @@ library; void f() {} '''); - assertResolvedNodeText(result.findNode.commentReference('A.foo]'), r''' + var node = result.findNode.commentReference('A.foo]'); + assertResolvedNodeText(node, r''' CommentReference expression: PrefixedIdentifier prefix: SimpleIdentifier @@ -533,7 +551,8 @@ library; void f() {} '''); - assertResolvedNodeText(result.findNode.commentReference('A.foo]'), r''' + var node = result.findNode.commentReference('A.foo]'); + assertResolvedNodeText(node, r''' CommentReference expression: PrefixedIdentifier prefix: SimpleIdentifier @@ -564,7 +583,8 @@ library; void f() {} '''); - assertResolvedNodeText(result.findNode.commentReference('E.foo]'), r''' + var node = result.findNode.commentReference('E.foo]'); + assertResolvedNodeText(node, r''' CommentReference expression: PrefixedIdentifier prefix: SimpleIdentifier @@ -595,7 +615,8 @@ library; void f() {} '''); - assertResolvedNodeText(result.findNode.commentReference('E.foo]'), r''' + var node = result.findNode.commentReference('E.foo]'); + assertResolvedNodeText(node, r''' CommentReference expression: PrefixedIdentifier prefix: SimpleIdentifier @@ -626,7 +647,8 @@ library; void f() {} '''); - assertResolvedNodeText(result.findNode.commentReference('E.foo]'), r''' + var node = result.findNode.commentReference('E.foo]'); + assertResolvedNodeText(node, r''' CommentReference expression: PrefixedIdentifier prefix: SimpleIdentifier @@ -657,7 +679,8 @@ library; void f() {} '''); - assertResolvedNodeText(result.findNode.commentReference('E.foo]'), r''' + var node = result.findNode.commentReference('E.foo]'); + assertResolvedNodeText(node, r''' CommentReference expression: PrefixedIdentifier prefix: SimpleIdentifier @@ -688,7 +711,8 @@ library; void f() {} '''); - assertResolvedNodeText(result.findNode.commentReference('E.foo]'), r''' + var node = result.findNode.commentReference('E.foo]'); + assertResolvedNodeText(node, r''' CommentReference expression: PrefixedIdentifier prefix: SimpleIdentifier @@ -719,7 +743,8 @@ library; void f() {} '''); - assertResolvedNodeText(result.findNode.commentReference('E.foo]'), r''' + var node = result.findNode.commentReference('E.foo]'); + assertResolvedNodeText(node, r''' CommentReference expression: PrefixedIdentifier prefix: SimpleIdentifier @@ -746,7 +771,8 @@ extension E on int { void f() {} '''); - assertResolvedNodeText(result.findNode.commentReference('E.foo]'), r''' + var node = result.findNode.commentReference('E.foo]'); + assertResolvedNodeText(node, r''' CommentReference expression: PrefixedIdentifier prefix: SimpleIdentifier @@ -773,7 +799,8 @@ extension E on int { void f() {} '''); - assertResolvedNodeText(result.findNode.commentReference('E.foo]'), r''' + var node = result.findNode.commentReference('E.foo]'); + assertResolvedNodeText(node, r''' CommentReference expression: PrefixedIdentifier prefix: SimpleIdentifier @@ -800,7 +827,8 @@ extension E on int { void f() {} '''); - assertResolvedNodeText(result.findNode.commentReference('E.foo]'), r''' + var node = result.findNode.commentReference('E.foo]'); + assertResolvedNodeText(node, r''' CommentReference expression: PrefixedIdentifier prefix: SimpleIdentifier @@ -827,7 +855,8 @@ extension E on int { void f() {} '''); - assertResolvedNodeText(result.findNode.commentReference('E.foo]'), r''' + var node = result.findNode.commentReference('E.foo]'); + assertResolvedNodeText(node, r''' CommentReference expression: PrefixedIdentifier prefix: SimpleIdentifier @@ -854,7 +883,8 @@ extension E on int { void f() {} '''); - assertResolvedNodeText(result.findNode.commentReference('E.foo]'), r''' + var node = result.findNode.commentReference('E.foo]'); + assertResolvedNodeText(node, r''' CommentReference expression: PrefixedIdentifier prefix: SimpleIdentifier @@ -881,7 +911,8 @@ extension E on int { void f() {} '''); - assertResolvedNodeText(result.findNode.commentReference('E.foo]'), r''' + var node = result.findNode.commentReference('E.foo]'); + assertResolvedNodeText(node, r''' CommentReference expression: PrefixedIdentifier prefix: SimpleIdentifier @@ -913,7 +944,8 @@ void f() {} '''); // TODO(srawlins): Set the type of named, and test it, here and below. - assertResolvedNodeText(result.findNode.commentReference('A.named]'), r''' + var node = result.findNode.commentReference('A.named]'); + assertResolvedNodeText(node, r''' CommentReference expression: PropertyAccess target: PrefixedIdentifier @@ -948,7 +980,8 @@ class A { void f() {} '''); - assertResolvedNodeText(result.findNode.commentReference('A.new]'), r''' + var node = result.findNode.commentReference('A.new]'); + assertResolvedNodeText(node, r''' CommentReference expression: PropertyAccess target: PrefixedIdentifier @@ -983,7 +1016,8 @@ class A { void f() {} '''); - assertResolvedNodeText(result.findNode.commentReference('A.foo]'), r''' + var node = result.findNode.commentReference('A.foo]'); + assertResolvedNodeText(node, r''' CommentReference expression: PropertyAccess target: PrefixedIdentifier @@ -1019,7 +1053,8 @@ typedef B = A; void f() {} '''); - assertResolvedNodeText(result.findNode.commentReference('B.foo]'), r''' + var node = result.findNode.commentReference('B.foo]'); + assertResolvedNodeText(node, r''' CommentReference expression: PropertyAccess target: PrefixedIdentifier @@ -1054,7 +1089,8 @@ class A { void f() {} '''); - assertResolvedNodeText(result.findNode.commentReference('A.foo]'), r''' + var node = result.findNode.commentReference('A.foo]'); + assertResolvedNodeText(node, r''' CommentReference expression: PropertyAccess target: PrefixedIdentifier @@ -1089,7 +1125,8 @@ class A { void f() {} '''); - assertResolvedNodeText(result.findNode.commentReference('A.foo]'), r''' + var node = result.findNode.commentReference('A.foo]'); + assertResolvedNodeText(node, r''' CommentReference expression: PropertyAccess target: PrefixedIdentifier @@ -1124,7 +1161,8 @@ class A { void f() {} '''); - assertResolvedNodeText(result.findNode.commentReference('A.foo]'), r''' + var node = result.findNode.commentReference('A.foo]'); + assertResolvedNodeText(node, r''' CommentReference expression: PropertyAccess target: PrefixedIdentifier @@ -1160,7 +1198,8 @@ typedef B = A; void f() {} '''); - assertResolvedNodeText(result.findNode.commentReference('B.foo]'), r''' + var node = result.findNode.commentReference('B.foo]'); + assertResolvedNodeText(node, r''' CommentReference expression: PropertyAccess target: PrefixedIdentifier @@ -1195,7 +1234,8 @@ class A { void f() {} '''); - assertResolvedNodeText(result.findNode.commentReference('A.foo]'), r''' + var node = result.findNode.commentReference('A.foo]'); + assertResolvedNodeText(node, r''' CommentReference expression: PropertyAccess target: PrefixedIdentifier @@ -1230,7 +1270,8 @@ class A { void f() {} '''); - assertResolvedNodeText(result.findNode.commentReference('A.foo]'), r''' + var node = result.findNode.commentReference('A.foo]'); + assertResolvedNodeText(node, r''' CommentReference expression: PropertyAccess target: PrefixedIdentifier @@ -1265,7 +1306,8 @@ extension E on int { void f() {} '''); - assertResolvedNodeText(result.findNode.commentReference('foo]'), r''' + var node = result.findNode.commentReference('foo]'); + assertResolvedNodeText(node, r''' CommentReference expression: PropertyAccess target: PrefixedIdentifier @@ -1300,7 +1342,8 @@ extension E on int { void f() {} '''); - assertResolvedNodeText(result.findNode.commentReference('E.foo]'), r''' + var node = result.findNode.commentReference('E.foo]'); + assertResolvedNodeText(node, r''' CommentReference expression: PropertyAccess target: PrefixedIdentifier @@ -1335,7 +1378,8 @@ extension E on int { void f() {} '''); - assertResolvedNodeText(result.findNode.commentReference('E.foo]'), r''' + var node = result.findNode.commentReference('E.foo]'); + assertResolvedNodeText(node, r''' CommentReference expression: PropertyAccess target: PrefixedIdentifier @@ -1370,7 +1414,8 @@ extension E on int { void f() {} '''); - assertResolvedNodeText(result.findNode.commentReference('E.foo]'), r''' + var node = result.findNode.commentReference('E.foo]'); + assertResolvedNodeText(node, r''' CommentReference expression: PropertyAccess target: PrefixedIdentifier @@ -1405,7 +1450,8 @@ extension E on int { void f() {} '''); - assertResolvedNodeText(result.findNode.commentReference('E.foo]'), r''' + var node = result.findNode.commentReference('E.foo]'); + assertResolvedNodeText(node, r''' CommentReference expression: PropertyAccess target: PrefixedIdentifier @@ -1440,7 +1486,8 @@ extension E on int { void f() {} '''); - assertResolvedNodeText(result.findNode.commentReference('E.foo]'), r''' + var node = result.findNode.commentReference('E.foo]'); + assertResolvedNodeText(node, r''' CommentReference expression: PropertyAccess target: PrefixedIdentifier @@ -1477,7 +1524,8 @@ set foo(int value) {} void f() {} '''); - assertResolvedNodeText(result.findNode.commentReference('foo]'), r''' + var node = result.findNode.commentReference('foo]'); + assertResolvedNodeText(node, r''' CommentReference expression: SimpleIdentifier token: foo @@ -1498,7 +1546,8 @@ extension E2 on int { } '''); - assertResolvedNodeText(result.findNode.commentReference('foo]'), r''' + var node = result.findNode.commentReference('foo]'); + assertResolvedNodeText(node, r''' CommentReference expression: SimpleIdentifier token: foo @@ -1515,7 +1564,8 @@ class A { } '''); - assertResolvedNodeText(result.findNode.commentReference('foo]'), r''' + var node = result.findNode.commentReference('foo]'); + assertResolvedNodeText(node, r''' CommentReference expression: SimpleIdentifier token: foo @@ -1534,7 +1584,8 @@ class A { } '''); - assertResolvedNodeText(result.findNode.commentReference('p]'), r''' + var node = result.findNode.commentReference('p]'); + assertResolvedNodeText(node, r''' CommentReference expression: SimpleIdentifier token: p @@ -1550,7 +1601,8 @@ class A { A(int p); }'''); - assertResolvedNodeText(result.findNode.commentReference('p]'), r''' + var node = result.findNode.commentReference('p]'); + assertResolvedNodeText(node, r''' CommentReference expression: SimpleIdentifier token: p @@ -1571,7 +1623,8 @@ class B extends A { } '''); - assertResolvedNodeText(result.findNode.commentReference('p]'), r''' + var node = result.findNode.commentReference('p]'); + assertResolvedNodeText(node, r''' CommentReference expression: SimpleIdentifier token: p @@ -1590,7 +1643,8 @@ enum Samurai { WITHOUT_SWORD }'''); - assertResolvedNodeText(result.findNode.commentReference('Samurai]'), r''' + var node1 = result.findNode.commentReference('Samurai]'); + assertResolvedNodeText(node1, r''' CommentReference expression: SimpleIdentifier token: Samurai @@ -1598,7 +1652,8 @@ CommentReference staticType: null '''); - assertResolvedNodeText(result.findNode.commentReference('int]'), r''' + var node2 = result.findNode.commentReference('int]'); + assertResolvedNodeText(node2, r''' CommentReference expression: SimpleIdentifier token: int @@ -1606,7 +1661,8 @@ CommentReference staticType: null '''); - assertResolvedNodeText(result.findNode.commentReference('WITH_SWORD]'), r''' + var node3 = result.findNode.commentReference('WITH_SWORD]'); + assertResolvedNodeText(node3, r''' CommentReference expression: SimpleIdentifier token: WITH_SWORD @@ -1636,7 +1692,8 @@ SimpleIdentifier foo(int p) => null; '''); - assertResolvedNodeText(result.findNode.commentReference('p]'), r''' + var node = result.findNode.commentReference('p]'); + assertResolvedNodeText(node, r''' CommentReference expression: SimpleIdentifier token: p @@ -1651,7 +1708,8 @@ CommentReference typedef Foo(int p); '''); - assertResolvedNodeText(result.findNode.commentReference('p]'), r''' + var node = result.findNode.commentReference('p]'); + assertResolvedNodeText(node, r''' CommentReference expression: SimpleIdentifier token: p @@ -1666,7 +1724,8 @@ CommentReference typedef Foo = Function(int p); '''); - assertResolvedNodeText(result.findNode.commentReference('T]'), r''' + var node1 = result.findNode.commentReference('T]'); + assertResolvedNodeText(node1, r''' CommentReference expression: SimpleIdentifier token: T @@ -1674,7 +1733,8 @@ CommentReference staticType: null '''); - assertResolvedNodeText(result.findNode.commentReference('S]'), r''' + var node2 = result.findNode.commentReference('S]'); + assertResolvedNodeText(node2, r''' CommentReference expression: SimpleIdentifier token: S @@ -1682,7 +1742,8 @@ CommentReference staticType: null '''); - assertResolvedNodeText(result.findNode.commentReference('p]'), r''' + var node3 = result.findNode.commentReference('p]'); + assertResolvedNodeText(node3, r''' CommentReference expression: SimpleIdentifier token: p @@ -1723,7 +1784,8 @@ abstract class A { } '''); - assertResolvedNodeText(result.findNode.commentReference('p1]'), r''' + var node1 = result.findNode.commentReference('p1]'); + assertResolvedNodeText(node1, r''' CommentReference expression: SimpleIdentifier token: p1 @@ -1731,7 +1793,8 @@ CommentReference staticType: null '''); - assertResolvedNodeText(result.findNode.commentReference('p2]'), r''' + var node2 = result.findNode.commentReference('p2]'); + assertResolvedNodeText(node2, r''' CommentReference expression: SimpleIdentifier token: p2 @@ -1739,7 +1802,8 @@ CommentReference staticType: null '''); - assertResolvedNodeText(result.findNode.commentReference('p3]'), r''' + var node3 = result.findNode.commentReference('p3]'); + assertResolvedNodeText(node3, r''' CommentReference expression: SimpleIdentifier token: p3 @@ -1747,7 +1811,8 @@ CommentReference staticType: null '''); - assertResolvedNodeText(result.findNode.commentReference('p4]'), r''' + var node4 = result.findNode.commentReference('p4]'); + assertResolvedNodeText(node4, r''' CommentReference expression: SimpleIdentifier token: p4 @@ -1755,7 +1820,8 @@ CommentReference staticType: null '''); - assertResolvedNodeText(result.findNode.commentReference('p5]'), r''' + var node5 = result.findNode.commentReference('p5]'); + assertResolvedNodeText(node5, r''' CommentReference expression: SimpleIdentifier token: p5 @@ -1763,7 +1829,8 @@ CommentReference staticType: null '''); - assertResolvedNodeText(result.findNode.commentReference('p6]'), r''' + var node6 = result.findNode.commentReference('p6]'); + assertResolvedNodeText(node6, r''' CommentReference expression: SimpleIdentifier token: p6 @@ -1786,7 +1853,8 @@ library; void f() {} '''); - assertResolvedNodeText(result.findNode.commentReference('foo]'), r''' + var node = result.findNode.commentReference('foo]'); + assertResolvedNodeText(node, r''' CommentReference expression: SimpleIdentifier token: foo @@ -1811,7 +1879,8 @@ extension E2 on int { } '''); - assertResolvedNodeText(result.findNode.commentReference('foo]'), r''' + var node = result.findNode.commentReference('foo]'); + assertResolvedNodeText(node, r''' CommentReference expression: SimpleIdentifier token: foo @@ -1835,7 +1904,8 @@ library; void f() {} '''); - assertResolvedNodeText(result.findNode.commentReference('C]'), r''' + var node = result.findNode.commentReference('C]'); + assertResolvedNodeText(node, r''' CommentReference expression: SimpleIdentifier token: C @@ -1863,7 +1933,8 @@ library; main() {} '''); - assertResolvedNodeText(result.findNode.commentReference('A]'), r''' + var node1 = result.findNode.commentReference('A]'); + assertResolvedNodeText(node1, r''' CommentReference newKeyword: new expression: SimpleIdentifier @@ -1872,7 +1943,8 @@ CommentReference staticType: null '''); - assertResolvedNodeText(result.findNode.commentReference('A.named]'), r''' + var node2 = result.findNode.commentReference('A.named]'); + assertResolvedNodeText(node2, r''' CommentReference newKeyword: new expression: PrefixedIdentifier @@ -1905,7 +1977,8 @@ enum E { } '''); - assertResolvedNodeText(result.findNode.commentReference('foo]'), r''' + var node = result.findNode.commentReference('foo]'); + assertResolvedNodeText(node, r''' CommentReference expression: SimpleIdentifier token: foo @@ -1926,7 +1999,8 @@ library; extension type ET(int it) {} '''); - assertResolvedNodeText(result.findNode.commentReference('foo]'), r''' + var node = result.findNode.commentReference('foo]'); + assertResolvedNodeText(node, r''' CommentReference expression: SimpleIdentifier token: foo @@ -1948,7 +2022,8 @@ class C { } '''); - assertResolvedNodeText(result.findNode.commentReference('A]'), r''' + var node = result.findNode.commentReference('A]'); + assertResolvedNodeText(node, r''' CommentReference expression: SimpleIdentifier token: A @@ -1968,7 +2043,8 @@ class A {} library; '''); - assertResolvedNodeText(result.findNode.commentReference('A]'), r''' + var node = result.findNode.commentReference('A]'); + assertResolvedNodeText(node, r''' CommentReference expression: SimpleIdentifier token: A @@ -1989,7 +2065,8 @@ library; void f() {} '''); - assertResolvedNodeText(result.findNode.commentReference('foo]'), r''' + var node = result.findNode.commentReference('foo]'); + assertResolvedNodeText(node, r''' CommentReference expression: SimpleIdentifier token: foo @@ -2009,7 +2086,8 @@ library; int x = 1; '''); - assertResolvedNodeText(result.findNode.commentReference('A]'), r''' + var node = result.findNode.commentReference('A]'); + assertResolvedNodeText(node, r''' CommentReference expression: SimpleIdentifier token: A @@ -2030,7 +2108,8 @@ library; typedef T = int; '''); - assertResolvedNodeText(result.findNode.commentReference('foo]'), r''' + var node = result.findNode.commentReference('foo]'); + assertResolvedNodeText(node, r''' CommentReference expression: SimpleIdentifier token: foo @@ -2054,7 +2133,8 @@ class A { main() {} '''); - assertResolvedNodeText(result.findNode.commentReference('A]'), r''' + var node1 = result.findNode.commentReference('A]'); + assertResolvedNodeText(node1, r''' CommentReference newKeyword: new expression: SimpleIdentifier @@ -2063,7 +2143,8 @@ CommentReference staticType: null '''); - assertResolvedNodeText(result.findNode.commentReference('A.named]'), r''' + var node2 = result.findNode.commentReference('A.named]'); + assertResolvedNodeText(node2, r''' CommentReference newKeyword: new expression: PrefixedIdentifier @@ -2128,7 +2209,8 @@ CommentReference void f(int bar()) {} '''); - assertResolvedNodeText(result.findNode.commentReference('bar]'), r''' + var node = result.findNode.commentReference('bar]'); + assertResolvedNodeText(node, r''' CommentReference expression: SimpleIdentifier token: bar @@ -2194,7 +2276,8 @@ class B extends A { } '''); - assertResolvedNodeText(result.findNode.commentReference('x] in A'), r''' + var node1 = result.findNode.commentReference('x] in A'); + assertResolvedNodeText(node1, r''' CommentReference expression: SimpleIdentifier token: x @@ -2202,7 +2285,8 @@ CommentReference staticType: null '''); - assertResolvedNodeText(result.findNode.commentReference('x] in B'), r''' + var node2 = result.findNode.commentReference('x] in B'); + assertResolvedNodeText(node2, r''' CommentReference expression: SimpleIdentifier token: x @@ -2221,7 +2305,8 @@ class A { class B extends A {} '''); - assertResolvedNodeText(result.findNode.commentReference('foo]'), r''' + var node = result.findNode.commentReference('foo]'); + assertResolvedNodeText(node, r''' CommentReference expression: SimpleIdentifier token: foo diff --git a/pkg/analyzer/test/src/dart/resolution/conditional_expression_test.dart b/pkg/analyzer/test/src/dart/resolution/conditional_expression_test.dart index cf9c2bda8b2..7bf357b3df6 100644 --- a/pkg/analyzer/test/src/dart/resolution/conditional_expression_test.dart +++ b/pkg/analyzer/test/src/dart/resolution/conditional_expression_test.dart @@ -117,9 +117,8 @@ f(bool b, C1 c1, C2 c2, Object? o) { } '''); - assertResolvedNodeText( - result.findNode.conditionalExpression('b ? c1 : c2'), - r''' + var node = result.findNode.conditionalExpression('b ? c1 : c2'); + assertResolvedNodeText(node, r''' ConditionalExpression condition: SimpleIdentifier token: b @@ -137,8 +136,7 @@ ConditionalExpression staticType: C2 correspondingParameter: staticType: A -''', - ); +'''); } test_issue49692() async { @@ -339,9 +337,8 @@ f(bool b, C1 c1, C2 c2) { } '''); - assertResolvedNodeText( - result.findNode.conditionalExpression('b ? c1 : c2'), - r'''ConditionalExpression + var node = result.findNode.conditionalExpression('b ? c1 : c2'); + assertResolvedNodeText(node, r'''ConditionalExpression condition: SimpleIdentifier token: b element: ::@function::f::@formalParameter::b @@ -360,8 +357,7 @@ f(bool b, C1 c1, C2 c2) { baseElement: ::@function::contextB1::@formalParameter::b1 substitution: {T: Object?} staticType: B1 -''', - ); +'''); } test_contextNotUsedIfLhsDoesNotSatisfyContext() async { @@ -378,9 +374,8 @@ f(bool b, B2 b2, C1 c1, Object? o) { } '''); - assertResolvedNodeText( - result.findNode.conditionalExpression('b ? b2 : c1'), - r'''ConditionalExpression + var node = result.findNode.conditionalExpression('b ? b2 : c1'); + assertResolvedNodeText(node, r'''ConditionalExpression condition: SimpleIdentifier token: b element: ::@function::f::@formalParameter::b @@ -397,8 +392,7 @@ f(bool b, B2 b2, C1 c1, Object? o) { staticType: C1 correspondingParameter: staticType: B2 -''', - ); +'''); } test_contextNotUsedIfRhsDoesNotSatisfyContext() async { @@ -415,9 +409,8 @@ f(bool b, C1 c1, B2 b2, Object? o) { } '''); - assertResolvedNodeText( - result.findNode.conditionalExpression('b ? c1 : b2'), - r'''ConditionalExpression + var node = result.findNode.conditionalExpression('b ? c1 : b2'); + assertResolvedNodeText(node, r'''ConditionalExpression condition: SimpleIdentifier token: b element: ::@function::f::@formalParameter::b @@ -434,8 +427,7 @@ f(bool b, C1 c1, B2 b2, Object? o) { staticType: B2 correspondingParameter: staticType: B2 -''', - ); +'''); } test_contextUsedInsteadOfLubIfLubDoesNotSatisfyContext() async { @@ -448,9 +440,8 @@ class C2 implements B1, B2 {} B1 f(bool b, C1 c1, C2 c2) => b ? c1 : c2; '''); - assertResolvedNodeText( - result.findNode.conditionalExpression('b ? c1 : c2'), - r''' + var node = result.findNode.conditionalExpression('b ? c1 : c2'); + assertResolvedNodeText(node, r''' ConditionalExpression condition: SimpleIdentifier token: b @@ -467,7 +458,6 @@ ConditionalExpression element: ::@function::f::@formalParameter::c2 staticType: C2 staticType: B1 -''', - ); +'''); } } diff --git a/pkg/analyzer/test/src/dart/resolution/dot_shorthand_constructor_invocation_test.dart b/pkg/analyzer/test/src/dart/resolution/dot_shorthand_constructor_invocation_test.dart index aae983ef681..4296723abce 100644 --- a/pkg/analyzer/test/src/dart/resolution/dot_shorthand_constructor_invocation_test.dart +++ b/pkg/analyzer/test/src/dart/resolution/dot_shorthand_constructor_invocation_test.dart @@ -217,8 +217,8 @@ void main() { } '''); - var method = result.findNode.methodInvocation('method();'); - assertResolvedNodeText(method, r''' + var node = result.findNode.methodInvocation('method();'); + assertResolvedNodeText(node, r''' MethodInvocation target: DotShorthandConstructorInvocation period: . @@ -263,8 +263,8 @@ void main() { } '''); - var method = result.findNode.methodInvocation('method();'); - assertResolvedNodeText(method, r''' + var node = result.findNode.methodInvocation('method();'); + assertResolvedNodeText(node, r''' MethodInvocation target: DotShorthandConstructorInvocation constKeyword: const @@ -310,8 +310,8 @@ void main() { } '''); - var propertyAccess = result.findNode.singlePropertyAccess; - assertResolvedNodeText(propertyAccess, r''' + var node = result.findNode.singlePropertyAccess; + assertResolvedNodeText(node, r''' PropertyAccess target: DotShorthandConstructorInvocation period: . @@ -352,8 +352,8 @@ void main() { } '''); - var propertyAccess = result.findNode.singlePropertyAccess; - assertResolvedNodeText(propertyAccess, r''' + var node = result.findNode.singlePropertyAccess; + assertResolvedNodeText(node, r''' PropertyAccess target: DotShorthandConstructorInvocation constKeyword: const @@ -393,9 +393,8 @@ void main() { } '''); - assertResolvedNodeText( - result.findNode.singleDotShorthandConstructorInvocation, - r''' + var node = result.findNode.singleDotShorthandConstructorInvocation; + assertResolvedNodeText(node, r''' DotShorthandConstructorInvocation period: . constructorName: SimpleIdentifier @@ -412,8 +411,7 @@ DotShorthandConstructorInvocation rightParenthesis: ) isDotShorthand: true staticType: A -''', - ); +'''); } test_conflict_instance_method() async { @@ -429,9 +427,8 @@ void main() { } '''); - assertResolvedNodeText( - result.findNode.singleDotShorthandConstructorInvocation, - r''' + var node = result.findNode.singleDotShorthandConstructorInvocation; + assertResolvedNodeText(node, r''' DotShorthandConstructorInvocation period: . constructorName: SimpleIdentifier @@ -448,8 +445,7 @@ DotShorthandConstructorInvocation rightParenthesis: ) isDotShorthand: true staticType: A -''', - ); +'''); } test_conflict_instance_method_factory() async { @@ -466,9 +462,8 @@ void main() { } '''); - assertResolvedNodeText( - result.findNode.singleDotShorthandConstructorInvocation, - r''' + var node = result.findNode.singleDotShorthandConstructorInvocation; + assertResolvedNodeText(node, r''' DotShorthandConstructorInvocation period: . constructorName: SimpleIdentifier @@ -480,8 +475,7 @@ DotShorthandConstructorInvocation rightParenthesis: ) isDotShorthand: true staticType: A -''', - ); +'''); } test_conflict_instance_setter() async { @@ -501,9 +495,8 @@ void main() { } '''); - assertResolvedNodeText( - result.findNode.singleDotShorthandConstructorInvocation, - r''' + var node = result.findNode.singleDotShorthandConstructorInvocation; + assertResolvedNodeText(node, r''' DotShorthandConstructorInvocation period: . constructorName: SimpleIdentifier @@ -520,8 +513,7 @@ DotShorthandConstructorInvocation rightParenthesis: ) isDotShorthand: true staticType: A -''', - ); +'''); } test_const_assert() async { @@ -767,8 +759,8 @@ void main() { } '''); - var identifier = result.findNode.singleDotShorthandConstructorInvocation; - assertResolvedNodeText(identifier, r''' + var node = result.findNode.singleDotShorthandConstructorInvocation; + assertResolvedNodeText(node, r''' DotShorthandConstructorInvocation period: . constructorName: SimpleIdentifier @@ -797,8 +789,8 @@ void main() { } '''); - var identifier = result.findNode.singleDotShorthandConstructorInvocation; - assertResolvedNodeText(identifier, r''' + var node = result.findNode.singleDotShorthandConstructorInvocation; + assertResolvedNodeText(node, r''' DotShorthandConstructorInvocation period: . constructorName: SimpleIdentifier @@ -838,8 +830,8 @@ void main() { } '''); - var identifier = result.findNode.singleDotShorthandConstructorInvocation; - assertResolvedNodeText(identifier, r''' + var node = result.findNode.singleDotShorthandConstructorInvocation; + assertResolvedNodeText(node, r''' DotShorthandConstructorInvocation constKeyword: const period: . @@ -1095,8 +1087,8 @@ void main() { } '''); - var constructor = result.findNode.singleFunctionExpressionInvocation; - assertResolvedNodeText(constructor, r''' + var node = result.findNode.singleFunctionExpressionInvocation; + assertResolvedNodeText(node, r''' FunctionExpressionInvocation function: DotShorthandConstructorInvocation period: . @@ -1452,9 +1444,8 @@ void main() { } '''); - assertResolvedNodeText( - result.findNode.singleDotShorthandConstructorInvocation, - r''' + var node = result.findNode.singleDotShorthandConstructorInvocation; + assertResolvedNodeText(node, r''' DotShorthandConstructorInvocation constKeyword: const period: . @@ -1468,8 +1459,7 @@ DotShorthandConstructorInvocation isDotShorthand: true correspondingParameter: staticType: _Private -''', - ); +'''); } test_requiredParameters_missing() async { diff --git a/pkg/analyzer/test/src/dart/resolution/dot_shorthand_invocation_test.dart b/pkg/analyzer/test/src/dart/resolution/dot_shorthand_invocation_test.dart index c06ca40584a..44c0abb85a0 100644 --- a/pkg/analyzer/test/src/dart/resolution/dot_shorthand_invocation_test.dart +++ b/pkg/analyzer/test/src/dart/resolution/dot_shorthand_invocation_test.dart @@ -162,8 +162,8 @@ void main() { } '''); - var identifier = result.findNode.singleDotShorthandInvocation; - assertResolvedNodeText(identifier, r''' + var node = result.findNode.singleDotShorthandInvocation; + assertResolvedNodeText(node, r''' DotShorthandInvocation period: . memberName: SimpleIdentifier @@ -194,8 +194,8 @@ void main() { } '''); - var identifier = result.findNode.singleDotShorthandInvocation; - assertResolvedNodeText(identifier, r''' + var node = result.findNode.singleDotShorthandInvocation; + assertResolvedNodeText(node, r''' DotShorthandInvocation period: . memberName: SimpleIdentifier @@ -226,8 +226,8 @@ void main() { } '''); - var identifier = result.findNode.singleDotShorthandInvocation; - assertResolvedNodeText(identifier, r''' + var node = result.findNode.singleDotShorthandInvocation; + assertResolvedNodeText(node, r''' DotShorthandInvocation period: . memberName: SimpleIdentifier @@ -262,8 +262,8 @@ void main() { } '''); - var identifier = result.findNode.singleDotShorthandInvocation; - assertResolvedNodeText(identifier, r''' + var node = result.findNode.singleDotShorthandInvocation; + assertResolvedNodeText(node, r''' DotShorthandInvocation period: . memberName: SimpleIdentifier @@ -358,8 +358,8 @@ void main() { } '''); - var identifier = result.findNode.singleDotShorthandInvocation; - assertResolvedNodeText(identifier, r''' + var node = result.findNode.singleDotShorthandInvocation; + assertResolvedNodeText(node, r''' DotShorthandInvocation period: . memberName: SimpleIdentifier @@ -713,8 +713,8 @@ void main() { '''); - var identifier = result.findNode.singleDotShorthandInvocation; - assertResolvedNodeText(identifier, r''' + var node = result.findNode.singleDotShorthandInvocation; + assertResolvedNodeText(node, r''' DotShorthandInvocation period: . memberName: SimpleIdentifier @@ -900,9 +900,8 @@ void main() { } '''); - assertResolvedNodeText( - result.findNode.singleDotShorthandConstructorInvocation, - r''' + var node = result.findNode.singleDotShorthandConstructorInvocation; + assertResolvedNodeText(node, r''' DotShorthandConstructorInvocation period: . constructorName: SimpleIdentifier @@ -915,8 +914,7 @@ DotShorthandConstructorInvocation isDotShorthand: true correspondingParameter: staticType: _Private -''', - ); +'''); } test_privateClass_sameLibrary_invocation() async { @@ -935,7 +933,8 @@ void main() { } '''); - assertResolvedNodeText(result.findNode.singleDotShorthandInvocation, r''' + var node = result.findNode.singleDotShorthandInvocation; + assertResolvedNodeText(node, r''' DotShorthandInvocation period: . memberName: SimpleIdentifier @@ -1015,9 +1014,8 @@ void main() { } '''); - assertResolvedNodeText( - result.findNode.singleDotShorthandConstructorInvocation, - r''' + var node = result.findNode.singleDotShorthandConstructorInvocation; + assertResolvedNodeText(node, r''' DotShorthandConstructorInvocation period: . constructorName: SimpleIdentifier @@ -1030,8 +1028,7 @@ DotShorthandConstructorInvocation isDotShorthand: true correspondingParameter: staticType: _Private -''', - ); +'''); } test_privateEnum_sameLibrary_invocation() async { @@ -1051,7 +1048,8 @@ void main() { } '''); - assertResolvedNodeText(result.findNode.singleDotShorthandInvocation, r''' + var node = result.findNode.singleDotShorthandInvocation; + assertResolvedNodeText(node, r''' DotShorthandInvocation period: . memberName: SimpleIdentifier @@ -1129,9 +1127,8 @@ void main() { } '''); - assertResolvedNodeText( - result.findNode.singleDotShorthandConstructorInvocation, - r''' + var node = result.findNode.singleDotShorthandConstructorInvocation; + assertResolvedNodeText(node, r''' DotShorthandConstructorInvocation period: . constructorName: SimpleIdentifier @@ -1149,8 +1146,7 @@ DotShorthandConstructorInvocation isDotShorthand: true correspondingParameter: staticType: _Private -''', - ); +'''); } test_privateExtensionType_sameLibrary_invocation() async { @@ -1169,7 +1165,8 @@ void main() { } '''); - assertResolvedNodeText(result.findNode.singleDotShorthandInvocation, r''' + var node = result.findNode.singleDotShorthandInvocation; + assertResolvedNodeText(node, r''' DotShorthandInvocation period: . memberName: SimpleIdentifier @@ -1226,7 +1223,8 @@ void main() { } '''); - assertResolvedNodeText(result.findNode.singleDotShorthandInvocation, r''' + var node = result.findNode.singleDotShorthandInvocation; + assertResolvedNodeText(node, r''' DotShorthandInvocation period: . memberName: SimpleIdentifier @@ -1272,8 +1270,8 @@ void main() { } '''); - var identifier = result.findNode.singleDotShorthandInvocation; - assertResolvedNodeText(identifier, r''' + var node = result.findNode.singleDotShorthandInvocation; + assertResolvedNodeText(node, r''' DotShorthandInvocation period: . memberName: SimpleIdentifier diff --git a/pkg/analyzer/test/src/dart/resolution/dot_shorthand_property_access_test.dart b/pkg/analyzer/test/src/dart/resolution/dot_shorthand_property_access_test.dart index 9d900bf1eb9..e0031f39b74 100644 --- a/pkg/analyzer/test/src/dart/resolution/dot_shorthand_property_access_test.dart +++ b/pkg/analyzer/test/src/dart/resolution/dot_shorthand_property_access_test.dart @@ -32,8 +32,8 @@ void main() { } '''); - var identifier = result.findNode.singleDotShorthandPropertyAccess; - assertResolvedNodeText(identifier, r''' + var node = result.findNode.singleDotShorthandPropertyAccess; + assertResolvedNodeText(node, r''' DotShorthandPropertyAccess period: . propertyName: SimpleIdentifier @@ -60,8 +60,8 @@ void main() { } '''); - var identifier = result.findNode.singleDotShorthandPropertyAccess; - assertResolvedNodeText(identifier, r''' + var node = result.findNode.singleDotShorthandPropertyAccess; + assertResolvedNodeText(node, r''' DotShorthandPropertyAccess period: . propertyName: SimpleIdentifier @@ -87,8 +87,8 @@ void main() { } '''); - var identifier = result.findNode.singleDotShorthandPropertyAccess; - assertResolvedNodeText(identifier, r''' + var node = result.findNode.singleDotShorthandPropertyAccess; + assertResolvedNodeText(node, r''' DotShorthandPropertyAccess period: . propertyName: SimpleIdentifier @@ -166,8 +166,8 @@ void main() { } '''); - var identifier = result.findNode.singleDotShorthandPropertyAccess; - assertResolvedNodeText(identifier, r''' + var node = result.findNode.singleDotShorthandPropertyAccess; + assertResolvedNodeText(node, r''' DotShorthandPropertyAccess period: . propertyName: SimpleIdentifier @@ -189,8 +189,8 @@ void main() { } '''); - var identifier = result.findNode.singleDotShorthandPropertyAccess; - assertResolvedNodeText(identifier, r''' + var node = result.findNode.singleDotShorthandPropertyAccess; + assertResolvedNodeText(node, r''' DotShorthandPropertyAccess period: . propertyName: SimpleIdentifier @@ -215,8 +215,8 @@ void main() { } '''); - var identifier = result.findNode.singleDotShorthandPropertyAccess; - assertResolvedNodeText(identifier, r''' + var node = result.findNode.singleDotShorthandPropertyAccess; + assertResolvedNodeText(node, r''' DotShorthandPropertyAccess period: . propertyName: SimpleIdentifier @@ -238,8 +238,8 @@ void main() { } '''); - var identifier = result.findNode.singleDotShorthandPropertyAccess; - assertResolvedNodeText(identifier, r''' + var node = result.findNode.singleDotShorthandPropertyAccess; + assertResolvedNodeText(node, r''' DotShorthandPropertyAccess period: . propertyName: SimpleIdentifier @@ -266,8 +266,8 @@ void main() { } '''); - var identifier = result.findNode.singleDotShorthandPropertyAccess; - assertResolvedNodeText(identifier, r''' + var node = result.findNode.singleDotShorthandPropertyAccess; + assertResolvedNodeText(node, r''' DotShorthandPropertyAccess period: . propertyName: SimpleIdentifier @@ -293,8 +293,8 @@ void main() { } '''); - var identifier = result.findNode.singleDotShorthandPropertyAccess; - assertResolvedNodeText(identifier, r''' + var node = result.findNode.singleDotShorthandPropertyAccess; + assertResolvedNodeText(node, r''' DotShorthandPropertyAccess period: . propertyName: SimpleIdentifier @@ -319,8 +319,8 @@ main() { } '''); - var identifier = result.findNode.singleDotShorthandPropertyAccess; - assertResolvedNodeText(identifier, r''' + var node = result.findNode.singleDotShorthandPropertyAccess; + assertResolvedNodeText(node, r''' DotShorthandPropertyAccess period: . propertyName: SimpleIdentifier @@ -346,8 +346,8 @@ main() { } '''); - var identifier = result.findNode.singleDotShorthandPropertyAccess; - assertResolvedNodeText(identifier, r''' + var node = result.findNode.singleDotShorthandPropertyAccess; + assertResolvedNodeText(node, r''' DotShorthandPropertyAccess period: . propertyName: SimpleIdentifier @@ -369,8 +369,8 @@ void main() { } '''); - var identifier = result.findNode.singleDotShorthandPropertyAccess; - assertResolvedNodeText(identifier, r''' + var node = result.findNode.singleDotShorthandPropertyAccess; + assertResolvedNodeText(node, r''' DotShorthandPropertyAccess period: . propertyName: SimpleIdentifier @@ -446,8 +446,8 @@ void main() { } '''); - var identifier = result.findNode.singleDotShorthandPropertyAccess; - assertResolvedNodeText(identifier, r''' + var node = result.findNode.singleDotShorthandPropertyAccess; + assertResolvedNodeText(node, r''' DotShorthandPropertyAccess period: . propertyName: SimpleIdentifier @@ -727,8 +727,8 @@ main() { } '''); - var identifier = result.findNode.singleDotShorthandPropertyAccess; - assertResolvedNodeText(identifier, r''' + var node = result.findNode.singleDotShorthandPropertyAccess; + assertResolvedNodeText(node, r''' DotShorthandPropertyAccess period: . propertyName: SimpleIdentifier @@ -752,8 +752,8 @@ void main() { } '''); - var identifier = result.findNode.singleDotShorthandPropertyAccess; - assertResolvedNodeText(identifier, r''' + var node = result.findNode.singleDotShorthandPropertyAccess; + assertResolvedNodeText(node, r''' DotShorthandPropertyAccess period: . propertyName: SimpleIdentifier @@ -777,8 +777,8 @@ void main() { } '''); - var identifier = result.findNode.singleDotShorthandPropertyAccess; - assertResolvedNodeText(identifier, r''' + var node = result.findNode.singleDotShorthandPropertyAccess; + assertResolvedNodeText(node, r''' DotShorthandPropertyAccess period: . propertyName: SimpleIdentifier @@ -812,8 +812,8 @@ void main() { '''); - var identifier = result.findNode.singleDotShorthandPropertyAccess; - assertResolvedNodeText(identifier, r''' + var node = result.findNode.singleDotShorthandPropertyAccess; + assertResolvedNodeText(node, r''' DotShorthandPropertyAccess period: . propertyName: SimpleIdentifier @@ -901,9 +901,8 @@ void main() { } '''); - assertResolvedNodeText( - result.findNode.singleDotShorthandPropertyAccess, - r''' + var node = result.findNode.singleDotShorthandPropertyAccess; + assertResolvedNodeText(node, r''' DotShorthandPropertyAccess period: . propertyName: SimpleIdentifier @@ -913,8 +912,7 @@ DotShorthandPropertyAccess isDotShorthand: true correspondingParameter: staticType: _Private -''', - ); +'''); } test_privateEnum_otherLibrary() async { @@ -951,9 +949,8 @@ void main() { } '''); - assertResolvedNodeText( - result.findNode.singleDotShorthandPropertyAccess, - r''' + var node = result.findNode.singleDotShorthandPropertyAccess; + assertResolvedNodeText(node, r''' DotShorthandPropertyAccess period: . propertyName: SimpleIdentifier @@ -963,8 +960,7 @@ DotShorthandPropertyAccess isDotShorthand: true correspondingParameter: staticType: _Private -''', - ); +'''); } test_privateExtensionType_otherLibrary() async { @@ -1005,9 +1001,8 @@ void main() { } '''); - assertResolvedNodeText( - result.findNode.singleDotShorthandPropertyAccess, - r''' + var node = result.findNode.singleDotShorthandPropertyAccess; + assertResolvedNodeText(node, r''' DotShorthandPropertyAccess period: . propertyName: SimpleIdentifier @@ -1017,8 +1012,7 @@ DotShorthandPropertyAccess isDotShorthand: true correspondingParameter: staticType: _Private -''', - ); +'''); } test_privateMixin_otherLibrary() async { @@ -1061,9 +1055,8 @@ void main() { } '''); - assertResolvedNodeText( - result.findNode.singleDotShorthandPropertyAccess, - r''' + var node = result.findNode.singleDotShorthandPropertyAccess; + assertResolvedNodeText(node, r''' DotShorthandPropertyAccess period: . propertyName: SimpleIdentifier @@ -1073,8 +1066,7 @@ DotShorthandPropertyAccess isDotShorthand: true correspondingParameter: staticType: _Private -''', - ); +'''); } test_tearOff_constructor() async { @@ -1092,8 +1084,8 @@ main() { } '''); - var identifier = result.findNode.singleDotShorthandPropertyAccess; - assertResolvedNodeText(identifier, r''' + var node = result.findNode.singleDotShorthandPropertyAccess; + assertResolvedNodeText(node, r''' DotShorthandPropertyAccess period: . propertyName: SimpleIdentifier @@ -1135,8 +1127,8 @@ void main() { } '''); - var dotShorthand = result.findNode.singleDotShorthandPropertyAccess; - assertResolvedNodeText(dotShorthand, r''' + var node = result.findNode.singleDotShorthandPropertyAccess; + assertResolvedNodeText(node, r''' DotShorthandPropertyAccess period: . propertyName: SimpleIdentifier @@ -1157,8 +1149,8 @@ void main() { } '''); - var identifier = result.findNode.singleDotShorthandPropertyAccess; - assertResolvedNodeText(identifier, r''' + var node = result.findNode.singleDotShorthandPropertyAccess; + assertResolvedNodeText(node, r''' DotShorthandPropertyAccess period: . propertyName: SimpleIdentifier diff --git a/pkg/analyzer/test/src/dart/resolution/extension_method_test.dart b/pkg/analyzer/test/src/dart/resolution/extension_method_test.dart index d25e5c4732b..618610e123b 100644 --- a/pkg/analyzer/test/src/dart/resolution/extension_method_test.dart +++ b/pkg/analyzer/test/src/dart/resolution/extension_method_test.dart @@ -87,8 +87,8 @@ class C {} @ann extension E on C {} '''); - var annotation = result.findNode.annotation('@ann'); - assertResolvedNodeText(annotation, r''' + var node = result.findNode.annotation('@ann'); + assertResolvedNodeText(node, r''' Annotation atSign: @ name: SimpleIdentifier @@ -224,8 +224,8 @@ f(C c) { c.a; } '''); - var access = result.findNode.prefixed('c.a'); - assertResolvedNodeText(access, r''' + var node = result.findNode.prefixed('c.a'); + assertResolvedNodeText(node, r''' PrefixedIdentifier prefix: SimpleIdentifier token: c @@ -259,8 +259,8 @@ f(Object o, A a) { o.a; } '''); - var access = result.findNode.prefixed('o.a'); - assertResolvedNodeText(access, r''' + var node = result.findNode.prefixed('o.a'); + assertResolvedNodeText(node, r''' PrefixedIdentifier prefix: SimpleIdentifier token: o @@ -293,8 +293,8 @@ f(C c) { c.a; } '''); - var access = result.findNode.prefixed('c.a'); - assertResolvedNodeText(access, r''' + var node = result.findNode.prefixed('c.a'); + assertResolvedNodeText(node, r''' PrefixedIdentifier prefix: SimpleIdentifier token: c @@ -323,8 +323,8 @@ f(C c) { c.a; } '''); - var access = result.findNode.prefixed('c.a'); - assertResolvedNodeText(access, r''' + var node = result.findNode.prefixed('c.a'); + assertResolvedNodeText(node, r''' PrefixedIdentifier prefix: SimpleIdentifier token: c @@ -355,8 +355,8 @@ f(C c) { c.a; } '''); - var access = result.findNode.prefixed('c.a'); - assertResolvedNodeText(access, r''' + var node = result.findNode.prefixed('c.a'); + assertResolvedNodeText(node, r''' PrefixedIdentifier prefix: SimpleIdentifier token: c @@ -413,8 +413,8 @@ class ExtensionMethodsExtendedTypeTest extends PubPackageResolutionTest { class C {} extension E on C {} '''); - var extendedType = result.findNode.typeAnnotation('C'); - assertResolvedNodeText(extendedType, r''' + var node = result.findNode.typeAnnotation('C'); + assertResolvedNodeText(node, r''' NamedType name: C typeArguments: TypeArgumentList @@ -434,8 +434,8 @@ NamedType var result = await resolveTestCodeWithDiagnostics(''' extension E on dynamic {} '''); - var extendedType = result.findNode.typeAnnotation('dynamic'); - assertResolvedNodeText(extendedType, r''' + var node = result.findNode.typeAnnotation('dynamic'); + assertResolvedNodeText(node, r''' NamedType name: dynamic element: dynamic @@ -448,8 +448,8 @@ NamedType enum A {a, b, c} extension E on A {} '''); - var extendedType = result.findNode.typeAnnotation('A {}'); - assertResolvedNodeText(extendedType, r''' + var node = result.findNode.typeAnnotation('A {}'); + assertResolvedNodeText(node, r''' NamedType name: A element: ::@enum::A @@ -461,8 +461,8 @@ NamedType var result = await resolveTestCodeWithDiagnostics(''' extension E on int Function(int) {} '''); - var extendedType = result.findNode.typeAnnotation('Function'); - assertResolvedNodeText(extendedType, r''' + var node = result.findNode.typeAnnotation('Function'); + assertResolvedNodeText(node, r''' GenericFunctionType returnType: NamedType name: int @@ -500,8 +500,8 @@ extension E on C {} var result = await resolveTestCodeWithDiagnostics(code); - var extendedType = result.findNode.typeAnnotation('C {}'); - assertResolvedNodeText(extendedType, r''' + var node = result.findNode.typeAnnotation('C {}'); + assertResolvedNodeText(node, r''' NamedType name: C element: ::@class::C @@ -515,8 +515,8 @@ mixin M { } extension E on M {} '''); - var extendedType = result.findNode.typeAnnotation('M {}'); - assertResolvedNodeText(extendedType, r''' + var node = result.findNode.typeAnnotation('M {}'); + assertResolvedNodeText(node, r''' NamedType name: M element: ::@mixin::M @@ -529,8 +529,8 @@ NamedType class C {} extension on C {} '''); - var extendedType = result.findNode.typeAnnotation('C'); - assertResolvedNodeText(extendedType, r''' + var node = result.findNode.typeAnnotation('C'); + assertResolvedNodeText(node, r''' NamedType name: C typeArguments: TypeArgumentList @@ -550,8 +550,8 @@ NamedType var result = await resolveTestCodeWithDiagnostics(''' extension on dynamic {} '''); - var extendedType = result.findNode.typeAnnotation('dynamic'); - assertResolvedNodeText(extendedType, r''' + var node = result.findNode.typeAnnotation('dynamic'); + assertResolvedNodeText(node, r''' NamedType name: dynamic element: dynamic @@ -564,8 +564,8 @@ NamedType enum A {a, b, c} extension on A {} '''); - var extendedType = result.findNode.typeAnnotation('A {}'); - assertResolvedNodeText(extendedType, r''' + var node = result.findNode.typeAnnotation('A {}'); + assertResolvedNodeText(node, r''' NamedType name: A element: ::@enum::A @@ -577,8 +577,8 @@ NamedType var result = await resolveTestCodeWithDiagnostics(''' extension on int Function(String) {} '''); - var extendedType = result.findNode.typeAnnotation('Function'); - assertResolvedNodeText(extendedType, r''' + var node = result.findNode.typeAnnotation('Function'); + assertResolvedNodeText(node, r''' GenericFunctionType returnType: NamedType name: int @@ -613,8 +613,8 @@ GenericFunctionType class C { } extension on C {} '''); - var extendedType = result.findNode.typeAnnotation('C {}'); - assertResolvedNodeText(extendedType, r''' + var node = result.findNode.typeAnnotation('C {}'); + assertResolvedNodeText(node, r''' NamedType name: C element: ::@class::C @@ -628,8 +628,8 @@ mixin M { } extension on M {} '''); - var extendedType = result.findNode.typeAnnotation('M {}'); - assertResolvedNodeText(extendedType, r''' + var node = result.findNode.typeAnnotation('M {}'); + assertResolvedNodeText(node, r''' NamedType name: M element: ::@mixin::M @@ -674,8 +674,8 @@ f(C c) { c(2); } '''); - var invocation = result.findNode.functionExpressionInvocation('c(2)'); - assertResolvedNodeText(invocation, r''' + var node = result.findNode.functionExpressionInvocation('c(2)'); + assertResolvedNodeText(node, r''' FunctionExpressionInvocation function: SimpleIdentifier token: c @@ -707,8 +707,8 @@ f(C c) { c(2); } '''); - var invocation = result.findNode.functionExpressionInvocation('c(2)'); - assertResolvedNodeText(invocation, r''' + var node = result.findNode.functionExpressionInvocation('c(2)'); + assertResolvedNodeText(node, r''' FunctionExpressionInvocation function: SimpleIdentifier token: c @@ -738,8 +738,8 @@ f() { 1(2); } '''); - var invocation = result.findNode.functionExpressionInvocation('1(2)'); - assertResolvedNodeText(invocation, r''' + var node = result.findNode.functionExpressionInvocation('1(2)'); + assertResolvedNodeText(node, r''' FunctionExpressionInvocation function: IntegerLiteral literal: 1 @@ -770,8 +770,8 @@ f(C c) { c += 2; } '''); - var assignment = result.findNode.assignment('+='); - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('+='); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: SimpleIdentifier token: c @@ -801,8 +801,8 @@ f(C c) { c += 2; } '''); - var assignment = result.findNode.assignment('+='); - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('+='); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: SimpleIdentifier token: c @@ -834,8 +834,8 @@ extension E2 on T { } } '''); - var identifier = result.findNode.simple('g;'); - assertResolvedNodeText(identifier, r''' + var node = result.findNode.simple('g;'); + assertResolvedNodeText(node, r''' SimpleIdentifier token: g element: ::@extension::E1::@getter::g @@ -855,8 +855,8 @@ extension E2 on C { } } '''); - var identifier = result.findNode.simple('a;'); - assertResolvedNodeText(identifier, r''' + var node = result.findNode.simple('a;'); + assertResolvedNodeText(node, r''' SimpleIdentifier token: a element: ::@extension::E1::@getter::a @@ -875,8 +875,8 @@ extension E on T { } } '''); - var identifier = result.findNode.simple('g;'); - assertResolvedNodeText(identifier, r''' + var node = result.findNode.simple('g;'); + assertResolvedNodeText(node, r''' SimpleIdentifier token: g element: ::@class::B::@getter::g @@ -895,8 +895,8 @@ extension E on C { int get a => 1; } '''); - var identifier = result.findNode.simple('a;'); - assertResolvedNodeText(identifier, r''' + var node = result.findNode.simple('a;'); + assertResolvedNodeText(node, r''' SimpleIdentifier token: a element: ::@extension::E::@getter::a @@ -913,8 +913,8 @@ g(int Function(int) f) { f.a; } '''); - var access = result.findNode.prefixed('f.a'); - assertResolvedNodeText(access, r''' + var node = result.findNode.prefixed('f.a'); + assertResolvedNodeText(node, r''' PrefixedIdentifier prefix: SimpleIdentifier token: f @@ -942,8 +942,8 @@ f(C c) { c.a; } '''); - var access = result.findNode.prefixed('c.a'); - assertResolvedNodeText(access, r''' + var node = result.findNode.prefixed('c.a'); + assertResolvedNodeText(node, r''' PrefixedIdentifier prefix: SimpleIdentifier token: c @@ -1001,8 +1001,8 @@ f(Never a) { // [diag.deadCode] Dead code. } '''); - var access = result.findNode.prefixed('a.foo'); - assertResolvedNodeText(access, r''' + var node = result.findNode.prefixed('a.foo'); + assertResolvedNodeText(node, r''' PrefixedIdentifier prefix: SimpleIdentifier token: a @@ -1028,8 +1028,8 @@ f(int? a) { a.foo; } '''); - var access = result.findNode.prefixed('a.foo'); - assertResolvedNodeText(access, r''' + var node = result.findNode.prefixed('a.foo'); + assertResolvedNodeText(node, r''' PrefixedIdentifier prefix: SimpleIdentifier token: a @@ -1055,8 +1055,8 @@ f(int? a) { a?.foo; } '''); - var access = result.findNode.propertyAccess('foo;'); - assertResolvedNodeText(access, r''' + var node = result.findNode.propertyAccess('foo;'); + assertResolvedNodeText(node, r''' PropertyAccess target: SimpleIdentifier token: a @@ -1083,8 +1083,8 @@ f(C c) { c.a(0); } '''); - var invocation = result.findNode.functionExpressionInvocation('c.a(0)'); - assertResolvedNodeText(invocation, r''' + var node = result.findNode.functionExpressionInvocation('c.a(0)'); + assertResolvedNodeText(node, r''' FunctionExpressionInvocation function: PropertyAccess target: SimpleIdentifier @@ -1127,8 +1127,8 @@ f(B b) { b.a; } '''); - var access = result.findNode.prefixed('b.a'); - assertResolvedNodeText(access, r''' + var node = result.findNode.prefixed('b.a'); + assertResolvedNodeText(node, r''' PrefixedIdentifier prefix: SimpleIdentifier token: b @@ -1153,8 +1153,8 @@ g(int Function(int) f) { f.a(); } '''); - var invocation = result.findNode.functionExpressionInvocation('f.a()'); - assertResolvedNodeText(invocation, r''' + var node = result.findNode.functionExpressionInvocation('f.a()'); + assertResolvedNodeText(node, r''' FunctionExpressionInvocation function: PropertyAccess target: SimpleIdentifier @@ -1188,8 +1188,8 @@ extension E2 on T { } } '''); - var invocation = result.findNode.methodInvocation('m();'); - assertResolvedNodeText(invocation, r''' + var node = result.findNode.methodInvocation('m();'); + assertResolvedNodeText(node, r''' MethodInvocation methodName: SimpleIdentifier token: m @@ -1215,8 +1215,8 @@ extension E2 on B { } } '''); - var invocation = result.findNode.methodInvocation('a();'); - assertResolvedNodeText(invocation, r''' + var node = result.findNode.methodInvocation('a();'); + assertResolvedNodeText(node, r''' MethodInvocation methodName: SimpleIdentifier token: a @@ -1241,8 +1241,8 @@ extension E on T { } } '''); - var invocation = result.findNode.methodInvocation('m();'); - assertResolvedNodeText(invocation, r''' + var node = result.findNode.methodInvocation('m();'); + assertResolvedNodeText(node, r''' MethodInvocation methodName: SimpleIdentifier token: m @@ -1267,8 +1267,8 @@ extension E on B { void a() {} } '''); - var invocation = result.findNode.methodInvocation('a();'); - assertResolvedNodeText(invocation, r''' + var node = result.findNode.methodInvocation('a();'); + assertResolvedNodeText(node, r''' MethodInvocation methodName: SimpleIdentifier token: a @@ -1291,8 +1291,8 @@ g(int Function(int) f) { f.a(); } '''); - var invocation = result.findNode.methodInvocation('f.a()'); - assertResolvedNodeText(invocation, r''' + var node = result.findNode.methodInvocation('f.a()'); + assertResolvedNodeText(node, r''' MethodInvocation target: SimpleIdentifier token: f @@ -1323,8 +1323,8 @@ f(B b) { b.a(); } '''); - var invocation = result.findNode.methodInvocation('b.a()'); - assertResolvedNodeText(invocation, r''' + var node = result.findNode.methodInvocation('b.a()'); + assertResolvedNodeText(node, r''' MethodInvocation target: SimpleIdentifier token: b @@ -1462,8 +1462,8 @@ f(int? a) { a.foo(); } '''); - var invocation = result.findNode.methodInvocation('a.foo()'); - assertResolvedNodeText(invocation, r''' + var node = result.findNode.methodInvocation('a.foo()'); + assertResolvedNodeText(node, r''' MethodInvocation target: SimpleIdentifier token: a @@ -1492,8 +1492,8 @@ f(int? a) { null.foo(); } '''); - var invocation = result.findNode.methodInvocation('null.foo()'); - assertResolvedNodeText(invocation, r''' + var node = result.findNode.methodInvocation('null.foo()'); + assertResolvedNodeText(node, r''' MethodInvocation target: NullLiteral literal: null @@ -1521,8 +1521,8 @@ f(int? a) { a?.foo(); } '''); - var invocation = result.findNode.methodInvocation('a?.foo()'); - assertResolvedNodeText(invocation, r''' + var node = result.findNode.methodInvocation('a?.foo()'); + assertResolvedNodeText(node, r''' MethodInvocation target: SimpleIdentifier token: a @@ -1551,8 +1551,8 @@ f() { null.foo(); } '''); - var invocation = result.findNode.methodInvocation('null.foo()'); - assertResolvedNodeText(invocation, r''' + var node = result.findNode.methodInvocation('null.foo()'); + assertResolvedNodeText(node, r''' MethodInvocation target: NullLiteral literal: null @@ -1580,8 +1580,8 @@ void f() { 0._foo(); } '''); - var invocation = result.findNode.methodInvocation('_foo();'); - assertResolvedNodeText(invocation, r''' + var node = result.findNode.methodInvocation('_foo();'); + assertResolvedNodeText(node, r''' MethodInvocation target: IntegerLiteral literal: 0 @@ -1616,8 +1616,8 @@ void f() { } '''); - var invocation = result.findNode.methodInvocation('_foo();'); - assertResolvedNodeText(invocation, r''' + var node = result.findNode.methodInvocation('_foo();'); + assertResolvedNodeText(node, r''' MethodInvocation target: IntegerLiteral literal: 0 @@ -1652,8 +1652,8 @@ f(B b) { } '''); - var invocation = result.findNode.methodInvocation('b.a()'); - assertResolvedNodeText(invocation, r''' + var node = result.findNode.methodInvocation('b.a()'); + assertResolvedNodeText(node, r''' MethodInvocation target: SimpleIdentifier token: b @@ -1692,8 +1692,8 @@ f(B x, C o) { x.f(o); } '''); - var invocation = result.findNode.methodInvocation('x.f(o)'); - assertResolvedNodeText(invocation, r''' + var node = result.findNode.methodInvocation('x.f(o)'); + assertResolvedNodeText(node, r''' MethodInvocation target: SimpleIdentifier token: x @@ -1732,8 +1732,8 @@ f(C c) { c + 2; } '''); - var binary = result.findNode.binary('+ '); - assertResolvedNodeText(binary, r''' + var node = result.findNode.binary('+ '); + assertResolvedNodeText(node, r''' BinaryExpression leftOperand: SimpleIdentifier token: c @@ -1759,8 +1759,8 @@ g(int Function(int) f) { f + 2; } '''); - var binary = result.findNode.binary('+ '); - assertResolvedNodeText(binary, r''' + var node = result.findNode.binary('+ '); + assertResolvedNodeText(node, r''' BinaryExpression leftOperand: SimpleIdentifier token: f @@ -1787,8 +1787,8 @@ f(C c) { c + 2; } '''); - var binary = result.findNode.binary('+ '); - assertResolvedNodeText(binary, r''' + var node = result.findNode.binary('+ '); + assertResolvedNodeText(node, r''' BinaryExpression leftOperand: SimpleIdentifier token: c @@ -1817,8 +1817,8 @@ f(A? a) { a + 1; } '''); - var binary = result.findNode.binary('a + 1'); - assertResolvedNodeText(binary, r''' + var node = result.findNode.binary('a + 1'); + assertResolvedNodeText(node, r''' BinaryExpression leftOperand: SimpleIdentifier token: a @@ -1859,8 +1859,8 @@ f(C c) { c[2]; } '''); - var index = result.findNode.index('c[2]'); - assertResolvedNodeText(index, r''' + var node = result.findNode.index('c[2]'); + assertResolvedNodeText(node, r''' IndexExpression target: SimpleIdentifier token: c @@ -1886,8 +1886,8 @@ g(int Function(int) f) { f[2]; } '''); - var index = result.findNode.index('f[2]'); - assertResolvedNodeText(index, r''' + var node = result.findNode.index('f[2]'); + assertResolvedNodeText(node, r''' IndexExpression target: SimpleIdentifier token: f @@ -1914,8 +1914,8 @@ f(C c) { c[2]; } '''); - var index = result.findNode.index('c[2]'); - assertResolvedNodeText(index, r''' + var node = result.findNode.index('c[2]'); + assertResolvedNodeText(node, r''' IndexExpression target: SimpleIdentifier token: c @@ -1942,8 +1942,8 @@ f(int? a) { a[0]; } '''); - var index = result.findNode.index('a[0]'); - assertResolvedNodeText(index, r''' + var node = result.findNode.index('a[0]'); + assertResolvedNodeText(node, r''' IndexExpression target: SimpleIdentifier token: a @@ -1970,8 +1970,8 @@ f(int? a) { a?[0]; } '''); - var index = result.findNode.index('a?[0]'); - assertResolvedNodeText(index, r''' + var node = result.findNode.index('a?[0]'); + assertResolvedNodeText(node, r''' IndexExpression target: SimpleIdentifier token: a @@ -2001,8 +2001,8 @@ f(C c) { c[2] = 1; } '''); - var assignment = result.findNode.assignment('[2] ='); - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('[2] ='); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: IndexExpression target: SimpleIdentifier @@ -2040,8 +2040,8 @@ g(int Function(int) f) { f[2] = 3; } '''); - var assignment = result.findNode.assignment('f[2]'); - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('f[2]'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: IndexExpression target: SimpleIdentifier @@ -2080,8 +2080,8 @@ f(C c) { c[2] = 3; } '''); - var assignment = result.findNode.assignment('c[2]'); - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('c[2]'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: IndexExpression target: SimpleIdentifier @@ -2122,8 +2122,8 @@ f(C c) { c++; } '''); - var postfix = result.findNode.postfix('++'); - assertResolvedNodeText(postfix, r''' + var node = result.findNode.postfix('++'); + assertResolvedNodeText(node, r''' PostfixExpression operand: SimpleIdentifier token: c @@ -2148,8 +2148,8 @@ g(int Function(int) f) { f++; } '''); - var postfix = result.findNode.postfix('++'); - assertResolvedNodeText(postfix, r''' + var node = result.findNode.postfix('++'); + assertResolvedNodeText(node, r''' PostfixExpression operand: SimpleIdentifier token: f @@ -2175,8 +2175,8 @@ f(C c) { c++; } '''); - var postfix = result.findNode.postfix('++'); - assertResolvedNodeText(postfix, r''' + var node = result.findNode.postfix('++'); + assertResolvedNodeText(node, r''' PostfixExpression operand: SimpleIdentifier token: c @@ -2204,8 +2204,8 @@ f(A? a) { a++; } '''); - var expression = result.findNode.postfix('a++'); - assertResolvedNodeText(expression, r''' + var node = result.findNode.postfix('a++'); + assertResolvedNodeText(node, r''' PostfixExpression operand: SimpleIdentifier token: a @@ -2233,8 +2233,8 @@ f(C c) { ++c; } '''); - var prefix = result.findNode.prefix('++'); - assertResolvedNodeText(prefix, r''' + var node = result.findNode.prefix('++'); + assertResolvedNodeText(node, r''' PrefixExpression operator: ++ operand: SimpleIdentifier @@ -2259,8 +2259,8 @@ g(int Function(int) f) { ++f; } '''); - var prefix = result.findNode.prefix('++'); - assertResolvedNodeText(prefix, r''' + var node = result.findNode.prefix('++'); + assertResolvedNodeText(node, r''' PrefixExpression operator: ++ operand: SimpleIdentifier @@ -2286,8 +2286,8 @@ f(C c) { ++c; } '''); - var prefix = result.findNode.prefix('++'); - assertResolvedNodeText(prefix, r''' + var node = result.findNode.prefix('++'); + assertResolvedNodeText(node, r''' PrefixExpression operator: ++ operand: SimpleIdentifier @@ -2315,8 +2315,8 @@ f(A? a) { ++a; } '''); - var expression = result.findNode.prefix('++a'); - assertResolvedNodeText(expression, r''' + var node = result.findNode.prefix('++a'); + assertResolvedNodeText(node, r''' PrefixExpression operator: ++ operand: SimpleIdentifier @@ -2344,8 +2344,8 @@ f(C c) { -c; } '''); - var prefix = result.findNode.prefix('-c'); - assertResolvedNodeText(prefix, r''' + var node = result.findNode.prefix('-c'); + assertResolvedNodeText(node, r''' PrefixExpression operator: - operand: SimpleIdentifier @@ -2366,8 +2366,8 @@ g(int Function(int) f) { -f; } '''); - var prefix = result.findNode.prefix('-f'); - assertResolvedNodeText(prefix, r''' + var node = result.findNode.prefix('-f'); + assertResolvedNodeText(node, r''' PrefixExpression operator: - operand: SimpleIdentifier @@ -2389,8 +2389,8 @@ f(C c) { -c; } '''); - var prefix = result.findNode.prefix('-c'); - assertResolvedNodeText(prefix, r''' + var node = result.findNode.prefix('-c'); + assertResolvedNodeText(node, r''' PrefixExpression operator: - operand: SimpleIdentifier @@ -2414,8 +2414,8 @@ f(A? a) { -a; } '''); - var expression = result.findNode.prefix('-a'); - assertResolvedNodeText(expression, r''' + var node = result.findNode.prefix('-a'); + assertResolvedNodeText(node, r''' PrefixExpression operator: - operand: SimpleIdentifier @@ -2436,8 +2436,8 @@ g(int Function(int) f) { f.a = 1; } '''); - var assignment = result.findNode.assignment('a = 1'); - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('a = 1'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: PrefixedIdentifier prefix: SimpleIdentifier @@ -2517,7 +2517,8 @@ f(int? a) { a.foo = 1; } '''); - assertResolvedNodeText(result.findNode.assignment('foo = 1'), r''' + var node = result.findNode.assignment('foo = 1'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: PrefixedIdentifier prefix: SimpleIdentifier @@ -2555,7 +2556,8 @@ f(int? a) { a?.foo = 1; } '''); - assertResolvedNodeText(result.findNode.assignment('foo = 1'), r''' + var node = result.findNode.assignment('foo = 1'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: PropertyAccess target: SimpleIdentifier @@ -2594,8 +2596,8 @@ f(C c) { c.a = 1; } '''); - var assignment = result.findNode.assignment('a = 1'); - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('a = 1'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: PrefixedIdentifier prefix: SimpleIdentifier @@ -3244,8 +3246,8 @@ f() { p.E.a(); } '''); - var invocation = result.findNode.methodInvocation('E.a()'); - assertResolvedNodeText(invocation, r''' + var node = result.findNode.methodInvocation('E.a()'); + assertResolvedNodeText(node, r''' MethodInvocation target: PrefixedIdentifier prefix: SimpleIdentifier @@ -3284,8 +3286,8 @@ f() { E.a(); } '''); - var invocation = result.findNode.methodInvocation('E.a()'); - assertResolvedNodeText(invocation, r''' + var node = result.findNode.methodInvocation('E.a()'); + assertResolvedNodeText(node, r''' MethodInvocation target: SimpleIdentifier token: E @@ -3377,8 +3379,8 @@ f() { p.E.a = 3; } '''); - var assignment = result.findNode.assignment('a = 3'); - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('a = 3'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: PropertyAccess target: PrefixedIdentifier @@ -3425,8 +3427,8 @@ f() { E.a = 3; } '''); - var assignment = result.findNode.assignment('a = 3'); - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('a = 3'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: PrefixedIdentifier prefix: SimpleIdentifier @@ -4028,8 +4030,8 @@ extension E on C { int m() => this(2); } '''); - var invocation = result.findNode.functionExpressionInvocation('this(2)'); - assertResolvedNodeText(invocation, r''' + var node = result.findNode.functionExpressionInvocation('this(2)'); + assertResolvedNodeText(node, r''' FunctionExpressionInvocation function: ThisExpression thisKeyword: this @@ -4063,8 +4065,8 @@ extension E2 on int { } } '''); - var assignment = result.findNode.assignment('foo = 0'); - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('foo = 0'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: SimpleIdentifier token: foo @@ -4095,8 +4097,8 @@ extension E on C { int m() => a; } '''); - var identifier = result.findNode.simple('a;'); - assertResolvedNodeText(identifier, r''' + var node = result.findNode.simple('a;'); + assertResolvedNodeText(node, r''' SimpleIdentifier token: a element: ::@extension::E::@getter::a @@ -4115,8 +4117,8 @@ extension E on C { int m() => this.a; } '''); - var access = result.findNode.propertyAccess('this.a'); - assertResolvedNodeText(access, r''' + var node = result.findNode.propertyAccess('this.a'); + assertResolvedNodeText(node, r''' PropertyAccess target: ThisExpression thisKeyword: this @@ -4165,8 +4167,8 @@ extension E on C { void b() { a(); } } '''); - var invocation = result.findNode.methodInvocation('a();'); - assertResolvedNodeText(invocation, r''' + var node = result.findNode.methodInvocation('a();'); + assertResolvedNodeText(node, r''' MethodInvocation methodName: SimpleIdentifier token: a @@ -4190,8 +4192,8 @@ extension E on C { void b() { this.a(); } } '''); - var invocation = result.findNode.methodInvocation('this.a'); - assertResolvedNodeText(invocation, r''' + var node = result.findNode.methodInvocation('this.a'); + assertResolvedNodeText(node, r''' MethodInvocation target: ThisExpression thisKeyword: this @@ -4217,8 +4219,8 @@ extension E on C { void b() { this.a(); } } '''); - var invocation = result.findNode.methodInvocation('this.a'); - assertResolvedNodeText(invocation, r''' + var node = result.findNode.methodInvocation('this.a'); + assertResolvedNodeText(node, r''' MethodInvocation target: ThisExpression thisKeyword: this @@ -4246,8 +4248,8 @@ extension E on C { void b() { this + 2; } } '''); - var binary = result.findNode.binary('+ '); - assertResolvedNodeText(binary, r''' + var node = result.findNode.binary('+ '); + assertResolvedNodeText(node, r''' BinaryExpression leftOperand: ThisExpression thisKeyword: this @@ -4271,8 +4273,8 @@ extension E on C { void b() { this + 2; } } '''); - var binary = result.findNode.binary('+ '); - assertResolvedNodeText(binary, r''' + var node = result.findNode.binary('+ '); + assertResolvedNodeText(node, r''' BinaryExpression leftOperand: ThisExpression thisKeyword: this @@ -4298,8 +4300,8 @@ extension E on C { void b() { this[2]; } } '''); - var index = result.findNode.index('this[2]'); - assertResolvedNodeText(index, r''' + var node = result.findNode.index('this[2]'); + assertResolvedNodeText(node, r''' IndexExpression target: ThisExpression thisKeyword: this @@ -4323,8 +4325,8 @@ extension E on C { void b() { this[2]; } } '''); - var index = result.findNode.index('this[2]'); - assertResolvedNodeText(index, r''' + var node = result.findNode.index('this[2]'); + assertResolvedNodeText(node, r''' IndexExpression target: ThisExpression thisKeyword: this @@ -4350,8 +4352,8 @@ extension E on C { void b() { this[2] = 1; } } '''); - var assignment = result.findNode.assignment('this[2]'); - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('this[2]'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: IndexExpression target: ThisExpression @@ -4387,8 +4389,8 @@ extension E on C { void b() { this[2] = 3; } } '''); - var assignment = result.findNode.assignment('this[2]'); - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('this[2]'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: IndexExpression target: ThisExpression @@ -4426,8 +4428,8 @@ extension E on C { void b() { -this; } } '''); - var prefix = result.findNode.prefix('-this'); - assertResolvedNodeText(prefix, r''' + var node = result.findNode.prefix('-this'); + assertResolvedNodeText(node, r''' PrefixExpression operator: - operand: ThisExpression @@ -4446,8 +4448,8 @@ extension E on C { void b() { -this; } } '''); - var prefix = result.findNode.prefix('-this'); - assertResolvedNodeText(prefix, r''' + var node = result.findNode.prefix('-this'); + assertResolvedNodeText(node, r''' PrefixExpression operator: - operand: ThisExpression @@ -4495,8 +4497,8 @@ extension E on C { } } '''); - var assignment = result.findNode.assignment('a = 3'); - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('a = 3'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: SimpleIdentifier token: a @@ -4529,8 +4531,8 @@ extension E on C { } } '''); - var assignment = result.findNode.assignment('a = 3'); - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('a = 3'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: PropertyAccess target: ThisExpression @@ -4567,8 +4569,8 @@ extension E on C { } } '''); - var assignment = result.findNode.assignment('a = 3'); - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('a = 3'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: PropertyAccess target: ThisExpression @@ -4603,8 +4605,8 @@ extension E on C { get b => a; } '''); - var identifier = result.findNode.simple('a;'); - assertResolvedNodeText(identifier, r''' + var node = result.findNode.simple('a;'); + assertResolvedNodeText(node, r''' SimpleIdentifier token: a element: ::@extension::E::@method::a @@ -4621,8 +4623,8 @@ extension E on C { get c => this.a; } '''); - var identifier = result.findNode.propertyAccess('this.a;'); - assertResolvedNodeText(identifier, r''' + var node = result.findNode.propertyAccess('this.a;'); + assertResolvedNodeText(node, r''' PropertyAccess target: ThisExpression thisKeyword: this @@ -4645,8 +4647,8 @@ extension E on C { int m() => a; } '''); - var identifier = result.findNode.simple('a;'); - assertResolvedNodeText(identifier, r''' + var node = result.findNode.simple('a;'); + assertResolvedNodeText(node, r''' SimpleIdentifier token: a element: ::@extension::E::@getter::a @@ -4663,8 +4665,8 @@ extension E on C { static int m() => a; } '''); - var identifier = result.findNode.simple('a;'); - assertResolvedNodeText(identifier, r''' + var node = result.findNode.simple('a;'); + assertResolvedNodeText(node, r''' SimpleIdentifier token: a element: ::@extension::E::@getter::a @@ -4681,8 +4683,8 @@ extension E on C { int m() => a; } '''); - var identifier = result.findNode.simple('a;'); - assertResolvedNodeText(identifier, r''' + var node = result.findNode.simple('a;'); + assertResolvedNodeText(node, r''' SimpleIdentifier token: a element: ::@extension::E::@getter::a @@ -4699,8 +4701,8 @@ extension E on C { static int m() => a; } '''); - var identifier = result.findNode.simple('a;'); - assertResolvedNodeText(identifier, r''' + var node = result.findNode.simple('a;'); + assertResolvedNodeText(node, r''' SimpleIdentifier token: a element: ::@extension::E::@getter::a @@ -4716,8 +4718,8 @@ extension E on C { void b() { a(); } } '''); - var invocation = result.findNode.methodInvocation('a();'); - assertResolvedNodeText(invocation, r''' + var node = result.findNode.methodInvocation('a();'); + assertResolvedNodeText(node, r''' MethodInvocation methodName: SimpleIdentifier token: a @@ -4739,8 +4741,8 @@ extension E on C { static void b() { a(); } } '''); - var invocation = result.findNode.methodInvocation('a();'); - assertResolvedNodeText(invocation, r''' + var node = result.findNode.methodInvocation('a();'); + assertResolvedNodeText(node, r''' MethodInvocation methodName: SimpleIdentifier token: a @@ -4765,8 +4767,8 @@ extension E on C { } } '''); - var assignment = result.findNode.assignment('a = 3'); - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('a = 3'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: SimpleIdentifier token: a @@ -4797,8 +4799,8 @@ extension E on C { } } '''); - var assignment = result.findNode.assignment('a = 3'); - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('a = 3'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: SimpleIdentifier token: a @@ -4827,8 +4829,8 @@ extension E on C { get b => a; } '''); - var identifier = result.findNode.simple('a;'); - assertResolvedNodeText(identifier, r''' + var node = result.findNode.simple('a;'); + assertResolvedNodeText(node, r''' SimpleIdentifier token: a element: ::@extension::E::@method::a @@ -4845,8 +4847,8 @@ extension E on C { static get c => a; } '''); - var identifier = result.findNode.simple('a;'); - assertResolvedNodeText(identifier, r''' + var node = result.findNode.simple('a;'); + assertResolvedNodeText(node, r''' SimpleIdentifier token: a element: ::@extension::E::@method::a @@ -4868,8 +4870,8 @@ extension E on C { } } '''); - var invocation = result.findNode.methodInvocation('a();'); - assertResolvedNodeText(invocation, r''' + var node = result.findNode.methodInvocation('a();'); + assertResolvedNodeText(node, r''' MethodInvocation methodName: SimpleIdentifier token: a @@ -4897,8 +4899,8 @@ extension E on C { } } '''); - var invocation = result.findNode.methodInvocation('a();'); - assertResolvedNodeText(invocation, r''' + var node = result.findNode.methodInvocation('a();'); + assertResolvedNodeText(node, r''' MethodInvocation methodName: SimpleIdentifier token: a @@ -4926,8 +4928,8 @@ extension E on C { } } '''); - var identifier = result.findNode.simple('a;'); - assertResolvedNodeText(identifier, r''' + var node = result.findNode.simple('a;'); + assertResolvedNodeText(node, r''' SimpleIdentifier token: a element: ::@getter::a @@ -4949,8 +4951,8 @@ extension E on C { } } '''); - var identifier = result.findNode.simple('a;'); - assertResolvedNodeText(identifier, r''' + var node = result.findNode.simple('a;'); + assertResolvedNodeText(node, r''' SimpleIdentifier token: a element: ::@getter::a @@ -4972,8 +4974,8 @@ extension E on C { } } '''); - var assignment = result.findNode.assignment('a = 0'); - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('a = 0'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: SimpleIdentifier token: a @@ -5007,8 +5009,8 @@ extension E on C { } } '''); - var assignment = result.findNode.assignment('a = 0'); - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('a = 0'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: SimpleIdentifier token: a diff --git a/pkg/analyzer/test/src/dart/resolution/extension_override_test.dart b/pkg/analyzer/test/src/dart/resolution/extension_override_test.dart index f85c120597c..6ef19657e67 100644 --- a/pkg/analyzer/test/src/dart/resolution/extension_override_test.dart +++ b/pkg/analyzer/test/src/dart/resolution/extension_override_test.dart @@ -460,7 +460,8 @@ void f(int? a) { } '''); - assertResolvedNodeText(result.findNode.index('[0]'), r''' + var node = result.findNode.index('[0]'); + assertResolvedNodeText(node, r''' IndexExpression target: ExtensionOverride name: E @@ -499,7 +500,8 @@ void f(int? a) { } '''); - assertResolvedNodeText(result.findNode.assignment('[0] ='), r''' + var node = result.findNode.assignment('[0] ='); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: IndexExpression target: ExtensionOverride diff --git a/pkg/analyzer/test/src/dart/resolution/field_promotion_test.dart b/pkg/analyzer/test/src/dart/resolution/field_promotion_test.dart index d436a8a55d9..b787ec40676 100644 --- a/pkg/analyzer/test/src/dart/resolution/field_promotion_test.dart +++ b/pkg/analyzer/test/src/dart/resolution/field_promotion_test.dart @@ -92,9 +92,8 @@ void f(C? c) { } '''); // The `!` in the first statement promotes _field within the cascade - assertResolvedNodeText( - result.findNode.propertyAccess('_field.toString'), - r''' + var node2 = result.findNode.propertyAccess('_field.toString'); + assertResolvedNodeText(node2, r''' PropertyAccess operator: .. propertyName: SimpleIdentifier @@ -102,11 +101,11 @@ PropertyAccess element: ::@class::C::@getter::_field staticType: Object staticType: Object -''', - ); +'''); // But the promotion doesn't last beyond the cascade expression, due to the // implicit control flow join when the `?..` stops taking effect. - assertResolvedNodeText(result.findNode.propertyAccess('c?._field'), r''' + var node = result.findNode.propertyAccess('c?._field'); + assertResolvedNodeText(node, r''' PropertyAccess target: SimpleIdentifier token: c @@ -967,8 +966,8 @@ class C extends B { } } '''); - var blockA = result.findNode.block('// A'); - assertResolvedNodeText(blockA, r''' + var node1 = result.findNode.block('// A'); + assertResolvedNodeText(node1, r''' Block leftBracket: { statements @@ -992,8 +991,8 @@ Block semicolon: ; rightBracket: } '''); - var blockB = result.findNode.block('// B'); - assertResolvedNodeText(blockB, r''' + var node2 = result.findNode.block('// B'); + assertResolvedNodeText(node2, r''' Block leftBracket: { statements @@ -1041,8 +1040,8 @@ class C extends B { } } '''); - var blockA = result.findNode.block('// A'); - assertResolvedNodeText(blockA, r''' + var node1 = result.findNode.block('// A'); + assertResolvedNodeText(node1, r''' Block leftBracket: { statements @@ -1070,8 +1069,8 @@ Block semicolon: ; rightBracket: } '''); - var blockB = result.findNode.block('// B'); - assertResolvedNodeText(blockB, r''' + var node2 = result.findNode.block('// B'); + assertResolvedNodeText(node2, r''' Block leftBracket: { statements @@ -1123,8 +1122,8 @@ class C extends B { } } '''); - var blockA = result.findNode.block('// A'); - assertResolvedNodeText(blockA, r''' + var node1 = result.findNode.block('// A'); + assertResolvedNodeText(node1, r''' Block leftBracket: { statements @@ -1162,8 +1161,8 @@ Block semicolon: ; rightBracket: } '''); - var blockB = result.findNode.block('// B'); - assertResolvedNodeText(blockB, r''' + var node2 = result.findNode.block('// B'); + assertResolvedNodeText(node2, r''' Block leftBracket: { statements @@ -1225,8 +1224,8 @@ class C extends B { } } '''); - var blockA = result.findNode.block('// A'); - assertResolvedNodeText(blockA, r''' + var node1 = result.findNode.block('// A'); + assertResolvedNodeText(node1, r''' Block leftBracket: { statements @@ -1268,8 +1267,8 @@ Block semicolon: ; rightBracket: } '''); - var blockB = result.findNode.block('// B'); - assertResolvedNodeText(blockB, r''' + var node2 = result.findNode.block('// B'); + assertResolvedNodeText(node2, r''' Block leftBracket: { statements diff --git a/pkg/analyzer/test/src/dart/resolution/for_element_test.dart b/pkg/analyzer/test/src/dart/resolution/for_element_test.dart index 6a57252f0ed..a638c37f8a4 100644 --- a/pkg/analyzer/test/src/dart/resolution/for_element_test.dart +++ b/pkg/analyzer/test/src/dart/resolution/for_element_test.dart @@ -66,16 +66,16 @@ main() { } '''); - var node_1 = result.findNode.simple('i]; // 1'); - assertResolvedNodeText(node_1, r''' + var node1 = result.findNode.simple('i]; // 1'); + assertResolvedNodeText(node1, r''' SimpleIdentifier token: i element: i@26 staticType: int '''); - var node_2 = result.findNode.simple('i]; // 2'); - assertResolvedNodeText(node_2, r''' + var node2 = result.findNode.simple('i]; // 2'); + assertResolvedNodeText(node2, r''' SimpleIdentifier token: i element: i@65 @@ -1015,16 +1015,16 @@ main() { } '''); - var node_1 = result.findNode.simple('i]; // 1'); - assertResolvedNodeText(node_1, r''' + var node1 = result.findNode.simple('i]; // 1'); + assertResolvedNodeText(node1, r''' SimpleIdentifier token: i element: i@26 staticType: int '''); - var node_2 = result.findNode.simple('i]; // 2'); - assertResolvedNodeText(node_2, r''' + var node2 = result.findNode.simple('i]; // 2'); + assertResolvedNodeText(node2, r''' SimpleIdentifier token: i element: i@78 diff --git a/pkg/analyzer/test/src/dart/resolution/function_declaration_test.dart b/pkg/analyzer/test/src/dart/resolution/function_declaration_test.dart index 89992d2d687..2cbe4361409 100644 --- a/pkg/analyzer/test/src/dart/resolution/function_declaration_test.dart +++ b/pkg/analyzer/test/src/dart/resolution/function_declaration_test.dart @@ -143,16 +143,16 @@ void bar(a a) { } '''); - var node_1 = result.findNode.namedType('a a'); - assertResolvedNodeText(node_1, r''' + var node1 = result.findNode.namedType('a a'); + assertResolvedNodeText(node1, r''' NamedType name: a element: ::@class::a type: a '''); - var node_2 = result.findNode.simple('a;'); - assertResolvedNodeText(node_2, r''' + var node2 = result.findNode.simple('a;'); + assertResolvedNodeText(node2, r''' SimpleIdentifier token: a element: ::@function::bar::@formalParameter::a diff --git a/pkg/analyzer/test/src/dart/resolution/function_reference_test.dart b/pkg/analyzer/test/src/dart/resolution/function_reference_test.dart index b10b081e518..b6c2c1d5a43 100644 --- a/pkg/analyzer/test/src/dart/resolution/function_reference_test.dart +++ b/pkg/analyzer/test/src/dart/resolution/function_reference_test.dart @@ -31,9 +31,8 @@ class A { var x = (A.foo); '''); - assertResolvedNodeText( - result.findNode.functionReference('(A.foo);'), - r''' + var node = result.findNode.functionReference('(A.foo);'); + assertResolvedNodeText(node, r''' FunctionReference function: ParenthesizedExpression leftParenthesis: ( @@ -63,8 +62,7 @@ FunctionReference staticType: A Function() typeArgumentTypes int -''', - ); +'''); } test_constructorFunction_unnamed() async { @@ -76,9 +74,8 @@ class A { var x = (A.new); '''); - assertResolvedNodeText( - result.findNode.functionReference('(A.new);'), - r''' + var node = result.findNode.functionReference('(A.new);'); + assertResolvedNodeText(node, r''' FunctionReference function: ParenthesizedExpression leftParenthesis: ( @@ -108,8 +105,7 @@ FunctionReference staticType: A Function() typeArgumentTypes int -''', - ); +'''); } test_constructorReference() async { @@ -123,9 +119,8 @@ var x = A.foo; // [diag.wrongNumberOfTypeArgumentsConstructor] The constructor 'A.foo' doesn't have type parameters. '''); - assertResolvedNodeText( - result.findNode.functionReference('A.foo;'), - r''' + var node = result.findNode.functionReference('A.foo;'); + assertResolvedNodeText(node, r''' FunctionReference function: ConstructorReference constructorName: ConstructorName @@ -149,8 +144,7 @@ FunctionReference type: int rightBracket: > staticType: InvalidType -''', - ); +'''); } test_constructorReference_prefixed() async { @@ -160,9 +154,8 @@ var x = a.Future.delayed; // ^^^^^ // [diag.wrongNumberOfTypeArgumentsConstructor] The constructor 'a.Future.delayed' doesn't have type parameters. '''); - assertResolvedNodeText( - result.findNode.functionReference('a.Future.delayed;'), - r''' + var node = result.findNode.functionReference('a.Future.delayed;'); + assertResolvedNodeText(node, r''' FunctionReference function: ConstructorReference constructorName: ConstructorName @@ -190,8 +183,7 @@ FunctionReference type: int rightBracket: > staticType: InvalidType -''', - ); +'''); } test_dynamicTyped() async { @@ -205,7 +197,8 @@ void bar() { } '''); - assertResolvedNodeText(result.findNode.functionReference('i;'), r''' + var node = result.findNode.functionReference('i;'); + assertResolvedNodeText(node, r''' FunctionReference function: SimpleIdentifier token: i @@ -234,9 +227,8 @@ void bar() { } '''); - assertResolvedNodeText( - result.findNode.functionReference('i.foo();'), - r''' + var node = result.findNode.functionReference('i.foo();'); + assertResolvedNodeText(node, r''' FunctionReference function: SimpleIdentifier token: i @@ -251,8 +243,7 @@ FunctionReference type: int rightBracket: > staticType: InvalidType -''', - ); +'''); } test_explicitReceiver_dynamicTyped() async { @@ -266,9 +257,8 @@ foo() { } '''); - assertResolvedNodeText( - result.findNode.functionReference('f().instanceMethod;'), - r''' + var node = result.findNode.functionReference('f().instanceMethod;'); + assertResolvedNodeText(node, r''' FunctionReference function: PropertyAccess target: MethodInvocation @@ -296,8 +286,7 @@ FunctionReference type: int rightBracket: > staticType: InvalidType -''', - ); +'''); } test_explicitReceiver_unknown() async { @@ -309,7 +298,8 @@ bar() { } '''); - assertResolvedNodeText(result.findNode.functionReference('foo;'), r''' + var node = result.findNode.functionReference('foo;'); + assertResolvedNodeText(node, r''' FunctionReference function: PrefixedIdentifier prefix: SimpleIdentifier @@ -389,8 +379,8 @@ void foo() { } '''); - var reference = result.findNode.functionReference('E;'); - assertResolvedNodeText(reference, r''' + var node = result.findNode.functionReference('E;'); + assertResolvedNodeText(node, r''' FunctionReference function: SimpleIdentifier token: E @@ -422,8 +412,8 @@ void foo() { } '''); - var reference = result.findNode.functionReference('E;'); - assertResolvedNodeText(reference, r''' + var node = result.findNode.functionReference('E;'); + assertResolvedNodeText(node, r''' FunctionReference function: PrefixedIdentifier prefix: SimpleIdentifier @@ -464,7 +454,8 @@ bar(A a) { } '''); - assertResolvedNodeText(result.findNode.functionReference('foo;'), r''' + var node = result.findNode.functionReference('foo;'); + assertResolvedNodeText(node, r''' FunctionReference function: PropertyAccess target: ExtensionOverride @@ -512,8 +503,8 @@ extension E on A { } '''); - var reference = result.findNode.functionReference('foo;'); - assertResolvedNodeText(reference, r''' + var node = result.findNode.functionReference('foo;'); + assertResolvedNodeText(node, r''' FunctionReference function: SimpleIdentifier token: foo @@ -546,8 +537,8 @@ extension E on A { } '''); - var reference = result.findNode.functionReference('foo;'); - assertResolvedNodeText(reference, r''' + var node = result.findNode.functionReference('foo;'); + assertResolvedNodeText(node, r''' FunctionReference function: PropertyAccess target: ThisExpression @@ -588,8 +579,8 @@ bar(A a) { } '''); - var reference = result.findNode.functionReference('foo;'); - assertResolvedNodeText(reference, r''' + var node = result.findNode.functionReference('foo;'); + assertResolvedNodeText(node, r''' FunctionReference function: PropertyAccess target: ExtensionOverride @@ -643,8 +634,8 @@ bar(A a) { } '''); - var reference = result.findNode.functionReference('foo;'); - assertResolvedNodeText(reference, r''' + var node = result.findNode.functionReference('foo;'); + assertResolvedNodeText(node, r''' FunctionReference function: PropertyAccess operator: .. @@ -682,8 +673,8 @@ bar(A a) { } '''); - var reference = result.findNode.functionReference('foo;'); - assertResolvedNodeText(reference, r''' + var node = result.findNode.functionReference('foo;'); + assertResolvedNodeText(node, r''' FunctionReference function: PropertyAccess target: ExtensionOverride @@ -733,7 +724,8 @@ bar(A a) { } '''); - assertResolvedNodeText(result.findNode.functionReference('foo;'), r''' + var node = result.findNode.functionReference('foo;'); + assertResolvedNodeText(node, r''' FunctionReference function: PropertyAccess target: ExtensionOverride @@ -781,8 +773,8 @@ extension E on A { } '''); - var reference = result.findNode.functionReference('foo;'); - assertResolvedNodeText(reference, r''' + var node = result.findNode.functionReference('foo;'); + assertResolvedNodeText(node, r''' FunctionReference function: SimpleIdentifier token: foo @@ -815,7 +807,8 @@ extension on double { } '''); - assertResolvedNodeText(result.findNode.functionReference('foo;'), r''' + var node = result.findNode.functionReference('foo;'); + assertResolvedNodeText(node, r''' FunctionReference function: SimpleIdentifier token: foo @@ -842,9 +835,8 @@ void bar() { } '''); - assertResolvedNodeText( - result.findNode.functionReference('foo.call;'), - r''' + var node = result.findNode.functionReference('foo.call;'); + assertResolvedNodeText(node, r''' FunctionReference function: PrefixedIdentifier prefix: SimpleIdentifier @@ -869,8 +861,7 @@ FunctionReference staticType: void Function(int) typeArgumentTypes int -''', - ); +'''); } test_function_call_tooFewTypeArgs() async { @@ -884,9 +875,8 @@ void bar() { } '''); - assertResolvedNodeText( - result.findNode.functionReference('foo.call;'), - r''' + var node = result.findNode.functionReference('foo.call;'); + assertResolvedNodeText(node, r''' FunctionReference function: PrefixedIdentifier prefix: SimpleIdentifier @@ -912,8 +902,7 @@ FunctionReference typeArgumentTypes dynamic dynamic -''', - ); +'''); } test_function_call_tooManyTypeArgs() async { @@ -927,9 +916,8 @@ void bar() { } '''); - assertResolvedNodeText( - result.findNode.functionReference('foo.call;'), - r''' + var node = result.findNode.functionReference('foo.call;'); + assertResolvedNodeText(node, r''' FunctionReference function: PrefixedIdentifier prefix: SimpleIdentifier @@ -952,8 +940,7 @@ FunctionReference type: int rightBracket: > staticType: void Function(String) -''', - ); +'''); } test_function_call_typeArgNotMatchingBound() async { @@ -967,9 +954,8 @@ void bar() { } '''); - assertResolvedNodeText( - result.findNode.functionReference('foo.call;'), - r''' + var node = result.findNode.functionReference('foo.call;'); + assertResolvedNodeText(node, r''' FunctionReference function: PrefixedIdentifier prefix: SimpleIdentifier @@ -994,8 +980,7 @@ FunctionReference staticType: void Function(String) typeArgumentTypes String -''', - ); +'''); } test_function_extensionOnFunction() async { @@ -1013,9 +998,8 @@ extension on Function { } '''); - assertResolvedNodeText( - result.findNode.functionReference('foo.m;'), - r''' + var node = result.findNode.functionReference('foo.m;'); + assertResolvedNodeText(node, r''' FunctionReference function: PrefixedIdentifier prefix: SimpleIdentifier @@ -1040,8 +1024,7 @@ FunctionReference staticType: void Function(int) typeArgumentTypes int -''', - ); +'''); } test_function_extensionOnFunction_static() async { @@ -1059,9 +1042,8 @@ extension E on Function { } '''); - assertResolvedNodeText( - result.findNode.functionReference('foo.m;'), - r''' + var node = result.findNode.functionReference('foo.m;'); + assertResolvedNodeText(node, r''' FunctionReference function: PrefixedIdentifier prefix: SimpleIdentifier @@ -1084,8 +1066,7 @@ FunctionReference type: int rightBracket: > staticType: InvalidType -''', - ); +'''); } test_implicitCallTearoff() async { @@ -1429,7 +1410,8 @@ bar(A a) { } '''); - assertResolvedNodeText(result.findNode.functionReference('foo;'), r''' + var node = result.findNode.functionReference('foo;'); + assertResolvedNodeText(node, r''' FunctionReference function: PrefixedIdentifier prefix: SimpleIdentifier @@ -1469,7 +1451,8 @@ abstract class A { '''); - assertResolvedNodeText(result.findNode.functionReference('foo;'), r''' + var node = result.findNode.functionReference('foo;'); + assertResolvedNodeText(node, r''' FunctionReference function: SimpleIdentifier token: foo @@ -1536,7 +1519,8 @@ void foo(A a) { } '''); - assertResolvedNodeText(result.findNode.functionReference('f'), r''' + var node = result.findNode.functionReference('f'); + assertResolvedNodeText(node, r''' FunctionReference function: PrefixedIdentifier prefix: SimpleIdentifier @@ -1575,7 +1559,8 @@ void foo(A a) { } '''); - assertResolvedNodeText(result.findNode.functionReference('f'), r''' + var node = result.findNode.functionReference('f'); + assertResolvedNodeText(node, r''' FunctionReference function: PropertyAccess target: ParenthesizedExpression @@ -1615,8 +1600,8 @@ class A { } '''); - var reference = result.findNode.functionReference('foo;'); - assertResolvedNodeText(reference, r''' + var node = result.findNode.functionReference('foo;'); + assertResolvedNodeText(node, r''' FunctionReference function: SimpleIdentifier token: foo @@ -1647,11 +1632,11 @@ class C { } '''); - var reference = result.findNode.functionReference('foo.call;'); + var node = result.findNode.functionReference('foo.call;'); // TODO(srawlins): PropertyElementResolver does not return an element for // `.call`. If we want `findElement.method('foo')` here, we must change the // policy over there. - assertResolvedNodeText(reference, r''' + assertResolvedNodeText(node, r''' FunctionReference function: PrefixedIdentifier prefix: SimpleIdentifier @@ -1690,11 +1675,11 @@ void bar(C c) { } '''); - var reference = result.findNode.functionReference('foo.call;'); + var node = result.findNode.functionReference('foo.call;'); // TODO(srawlins): PropertyElementResolver does not return an element for // `.call`. If we want `findElement.method('foo')` here, we must change the // policy over there. - assertResolvedNodeText(reference, r''' + assertResolvedNodeText(node, r''' FunctionReference function: PropertyAccess target: PrefixedIdentifier @@ -1744,8 +1729,8 @@ class B { } '''); - var reference = result.findNode.functionReference('foo;'); - assertResolvedNodeText(reference, r''' + var node = result.findNode.functionReference('foo;'); + assertResolvedNodeText(node, r''' FunctionReference function: PrefixedIdentifier prefix: SimpleIdentifier @@ -1787,8 +1772,8 @@ void f(A a) { } '''); - var reference = result.findNode.functionReference('foo'); - assertResolvedNodeText(reference, r''' + var node = result.findNode.functionReference('foo'); + assertResolvedNodeText(node, r''' FunctionReference function: PropertyAccess target: ParenthesizedExpression @@ -1828,9 +1813,8 @@ void f(A? a, A b) { } '''); - assertResolvedNodeText( - result.findNode.functionReference('(a ?? b).foo;'), - r''' + var node = result.findNode.functionReference('(a ?? b).foo;'); + assertResolvedNodeText(node, r''' FunctionReference function: PropertyAccess target: ParenthesizedExpression @@ -1868,8 +1852,7 @@ FunctionReference staticType: void Function(int) typeArgumentTypes int -''', - ); +'''); } test_instanceMethod_explicitReceiver_parameter_promoted() async { @@ -1888,10 +1871,10 @@ extension StaticType on T { typedef Exactly = T Function(T); '''); - var reference = result.findNode.functionReference( + var node = result.findNode.functionReference( 'expectStaticType>;', ); - assertResolvedNodeText(reference, r''' + assertResolvedNodeText(node, r''' FunctionReference function: PrefixedIdentifier prefix: SimpleIdentifier @@ -1946,11 +1929,11 @@ extension on List { var a = [].foo.call; '''); - var reference = result.findNode.functionReference('foo.call;'); + var node = result.findNode.functionReference('foo.call;'); // TODO(srawlins): PropertyElementResolver does not return an element for // `.call`. If we want `findElement.method('foo')` here, we must change the // policy over there. - assertResolvedNodeText(reference, r''' + assertResolvedNodeText(node, r''' FunctionReference function: PropertyAccess target: PropertyAccess @@ -1996,8 +1979,8 @@ class B extends A { } '''); - var reference = result.findNode.functionReference('foo;'); - assertResolvedNodeText(reference, r''' + var node = result.findNode.functionReference('foo;'); + assertResolvedNodeText(node, r''' FunctionReference function: PropertyAccess target: SuperExpression @@ -2034,7 +2017,8 @@ class A { } '''); - assertResolvedNodeText(result.findNode.functionReference('foo;'), r''' + var node = result.findNode.functionReference('foo;'); + assertResolvedNodeText(node, r''' FunctionReference function: PropertyAccess target: SuperExpression @@ -2067,7 +2051,8 @@ bar() { } '''); - assertResolvedNodeText(result.findNode.functionReference('foo;'), r''' + var node = result.findNode.functionReference('foo;'); + assertResolvedNodeText(node, r''' FunctionReference function: PropertyAccess target: SuperExpression @@ -2105,8 +2090,8 @@ bar(A a) { } '''); - var reference = result.findNode.functionReference('foo'); - assertResolvedNodeText(reference, r''' + var node = result.findNode.functionReference('foo'); + assertResolvedNodeText(node, r''' FunctionReference function: PrefixedIdentifier prefix: SimpleIdentifier @@ -2145,8 +2130,8 @@ class A { } '''); - var reference = result.findNode.functionReference('foo;'); - assertResolvedNodeText(reference, r''' + var node = result.findNode.functionReference('foo;'); + assertResolvedNodeText(node, r''' FunctionReference function: PropertyAccess target: ThisExpression @@ -2184,8 +2169,8 @@ void bar() { } '''); - var reference = result.findNode.functionReference('foo;'); - assertResolvedNodeText(reference, r''' + var node = result.findNode.functionReference('foo;'); + assertResolvedNodeText(node, r''' FunctionReference function: PrefixedIdentifier prefix: SimpleIdentifier @@ -2228,8 +2213,8 @@ bar() { } '''); - var reference = result.findNode.functionReference('foo;'); - assertResolvedNodeText(reference, r''' + var node = result.findNode.functionReference('foo;'); + assertResolvedNodeText(node, r''' FunctionReference function: PropertyAccess target: PrefixedIdentifier @@ -2322,7 +2307,8 @@ bar() { } '''); - assertResolvedNodeText(result.findNode.functionReference('foo;'), r''' + var node = result.findNode.functionReference('foo;'); + assertResolvedNodeText(node, r''' FunctionReference function: PrefixedIdentifier prefix: SimpleIdentifier @@ -2359,8 +2345,8 @@ bar(A a) { } '''); - var reference = result.findNode.functionReference('foo;'); - assertResolvedNodeText(reference, r''' + var node = result.findNode.functionReference('foo;'); + assertResolvedNodeText(node, r''' FunctionReference function: PrefixedIdentifier prefix: SimpleIdentifier @@ -2399,8 +2385,8 @@ bar(A a) { } '''); - var reference = result.findNode.functionReference('foo;'); - assertResolvedNodeText(reference, r''' + var node = result.findNode.functionReference('foo;'); + assertResolvedNodeText(node, r''' FunctionReference function: PropertyAccess operator: .. @@ -2440,10 +2426,10 @@ extension StaticType on T { typedef Exactly = T Function(T); '''); - var reference = result.findNode.functionReference( + var node = result.findNode.functionReference( 'expectStaticType>;', ); - assertResolvedNodeText(reference, r''' + assertResolvedNodeText(node, r''' FunctionReference function: PrefixedIdentifier prefix: SimpleIdentifier @@ -2502,8 +2488,8 @@ class B extends A { } '''); - var reference = result.findNode.functionReference('foo;'); - assertResolvedNodeText(reference, r''' + var node = result.findNode.functionReference('foo;'); + assertResolvedNodeText(node, r''' FunctionReference function: SimpleIdentifier token: foo @@ -2672,8 +2658,8 @@ class A { } '''); - var reference = result.findNode.functionReference('foo'); - assertResolvedNodeText(reference, r''' + var node = result.findNode.functionReference('foo'); + assertResolvedNodeText(node, r''' FunctionReference function: SimpleIdentifier token: foo @@ -2756,8 +2742,8 @@ enum B with A { } '''); - var reference = result.findNode.functionReference('foo'); - assertResolvedNodeText(reference, r''' + var node = result.findNode.functionReference('foo'); + assertResolvedNodeText(node, r''' FunctionReference function: SimpleIdentifier token: foo @@ -2791,8 +2777,8 @@ enum A { } '''); - var reference = result.findNode.functionReference('foo'); - assertResolvedNodeText(reference, r''' + var node = result.findNode.functionReference('foo'); + assertResolvedNodeText(node, r''' FunctionReference function: SimpleIdentifier token: foo @@ -2825,8 +2811,8 @@ extension E on int { } '''); - var reference = result.findNode.functionReference('foo'); - assertResolvedNodeText(reference, r''' + var node = result.findNode.functionReference('foo'); + assertResolvedNodeText(node, r''' FunctionReference function: SimpleIdentifier token: foo @@ -2859,8 +2845,8 @@ extension type A(int it) { } '''); - var reference = result.findNode.functionReference('foo'); - assertResolvedNodeText(reference, r''' + var node = result.findNode.functionReference('foo'); + assertResolvedNodeText(node, r''' FunctionReference function: SimpleIdentifier token: foo @@ -2895,8 +2881,8 @@ mixin M on A { } '''); - var reference = result.findNode.functionReference('foo'); - assertResolvedNodeText(reference, r''' + var node = result.findNode.functionReference('foo'); + assertResolvedNodeText(node, r''' FunctionReference function: SimpleIdentifier token: foo @@ -2929,8 +2915,8 @@ mixin M { } '''); - var reference = result.findNode.functionReference('foo'); - assertResolvedNodeText(reference, r''' + var node = result.findNode.functionReference('foo'); + assertResolvedNodeText(node, r''' FunctionReference function: SimpleIdentifier token: foo @@ -2961,7 +2947,8 @@ class A { } '''); - assertResolvedNodeText(result.findNode.functionReference('foo;'), r''' + var node = result.findNode.functionReference('foo;'); + assertResolvedNodeText(node, r''' FunctionReference function: SimpleIdentifier token: foo @@ -3020,8 +3007,8 @@ void bar() { } '''); - var reference = result.findNode.functionReference('foo;'); - assertResolvedNodeText(reference, r''' + var node = result.findNode.functionReference('foo;'); + assertResolvedNodeText(node, r''' FunctionReference function: SimpleIdentifier token: foo @@ -3048,8 +3035,8 @@ void bar(void Function(T a) foo) { } '''); - var reference = result.findNode.functionReference('foo;'); - assertResolvedNodeText(reference, r''' + var node = result.findNode.functionReference('foo;'); + assertResolvedNodeText(node, r''' FunctionReference function: SimpleIdentifier token: foo @@ -3079,11 +3066,11 @@ void bar() { } '''); - var reference = result.findNode.functionReference('fn.call;'); + var node = result.findNode.functionReference('fn.call;'); // TODO(srawlins): PropertyElementResolver does not return an element for // `.call`. If we want `findElement.method('foo')` here, we must change the // policy over there. - assertResolvedNodeText(reference, r''' + assertResolvedNodeText(node, r''' FunctionReference function: PrefixedIdentifier prefix: SimpleIdentifier @@ -3123,11 +3110,11 @@ void bar() { } '''); - var reference = result.findNode.functionReference('fn.call;'); + var node = result.findNode.functionReference('fn.call;'); // TODO(srawlins): PropertyElementResolver does not return an element for // `.call`. If we want `findElement.method('fn')` here, we must change the // policy over there. - assertResolvedNodeText(reference, r''' + assertResolvedNodeText(node, r''' FunctionReference function: PrefixedIdentifier prefix: SimpleIdentifier @@ -3162,8 +3149,8 @@ void bar(T foo) { } '''); - var reference = result.findNode.functionReference('foo;'); - assertResolvedNodeText(reference, r''' + var node = result.findNode.functionReference('foo;'); + assertResolvedNodeText(node, r''' FunctionReference function: SimpleIdentifier token: foo @@ -3188,8 +3175,8 @@ void bar(U)>(T foo) { } '''); - var reference = result.findNode.functionReference('foo;'); - assertResolvedNodeText(reference, r''' + var node = result.findNode.functionReference('foo;'); + assertResolvedNodeText(node, r''' FunctionReference function: SimpleIdentifier token: foo @@ -3218,8 +3205,8 @@ void bar(T foo) { } '''); - var reference = result.findNode.functionReference('foo;'); - assertResolvedNodeText(reference, r''' + var node = result.findNode.functionReference('foo;'); + assertResolvedNodeText(node, r''' FunctionReference function: SimpleIdentifier token: foo @@ -3248,7 +3235,8 @@ void bar() { } '''); - assertResolvedNodeText(result.findNode.functionReference('i;'), r''' + var node = result.findNode.functionReference('i;'); + assertResolvedNodeText(node, r''' FunctionReference function: SimpleIdentifier token: i @@ -3279,8 +3267,8 @@ class A { } '''); - var reference = result.findNode.functionReference('foo;'); - assertResolvedNodeText(reference, r''' + var node = result.findNode.functionReference('foo;'); + assertResolvedNodeText(node, r''' FunctionReference function: SimpleIdentifier token: foo @@ -3337,9 +3325,8 @@ bar(dynamic a) { } '''); - assertResolvedNodeText( - result.findNode.functionReference('a.foo;'), - r''' + var node = result.findNode.functionReference('a.foo;'); + assertResolvedNodeText(node, r''' FunctionReference function: PrefixedIdentifier prefix: SimpleIdentifier @@ -3362,8 +3349,7 @@ FunctionReference type: int rightBracket: > staticType: InvalidType -''', - ); +'''); } test_recordField_explicitReceiver_named() async { @@ -3435,8 +3421,8 @@ class A { } '''); - var reference = result.findNode.functionReference('foo;'); - assertResolvedNodeText(reference, r''' + var node = result.findNode.functionReference('foo;'); + assertResolvedNodeText(node, r''' FunctionReference function: SimpleIdentifier token: foo @@ -3467,7 +3453,8 @@ bar() { } '''); - assertResolvedNodeText(result.findNode.functionReference('foo;'), r''' + var node = result.findNode.functionReference('foo;'); + assertResolvedNodeText(node, r''' FunctionReference function: PrefixedIdentifier prefix: SimpleIdentifier @@ -3509,8 +3496,8 @@ bar() { } '''); - var reference = result.findNode.functionReference('foo;'); - assertResolvedNodeText(reference, r''' + var node = result.findNode.functionReference('foo;'); + assertResolvedNodeText(node, r''' FunctionReference function: PropertyAccess target: PrefixedIdentifier @@ -3559,8 +3546,8 @@ bar() { } '''); - var reference = result.findNode.functionReference('foo;'); - assertResolvedNodeText(reference, r''' + var node = result.findNode.functionReference('foo;'); + assertResolvedNodeText(node, r''' FunctionReference function: PropertyAccess target: PrefixedIdentifier @@ -3610,8 +3597,8 @@ bar() { } '''); - var reference = result.findNode.functionReference('foo;'); - assertResolvedNodeText(reference, r''' + var node = result.findNode.functionReference('foo;'); + assertResolvedNodeText(node, r''' FunctionReference function: PropertyAccess target: PrefixedIdentifier @@ -3658,8 +3645,8 @@ bar() { } '''); - var reference = result.findNode.functionReference('foo;'); - assertResolvedNodeText(reference, r''' + var node = result.findNode.functionReference('foo;'); + assertResolvedNodeText(node, r''' FunctionReference function: PrefixedIdentifier prefix: SimpleIdentifier @@ -3736,8 +3723,8 @@ class A { } '''); - var reference = result.findNode.functionReference('foo;'); - assertResolvedNodeText(reference, r''' + var node = result.findNode.functionReference('foo;'); + assertResolvedNodeText(node, r''' FunctionReference function: SimpleIdentifier token: foo @@ -3771,8 +3758,8 @@ class A { } '''); - var reference = result.findNode.functionReference('foo;'); - assertResolvedNodeText(reference, r''' + var node = result.findNode.functionReference('foo;'); + assertResolvedNodeText(node, r''' FunctionReference function: SimpleIdentifier token: foo @@ -3805,8 +3792,8 @@ void bar() { } '''); - var reference = result.findNode.functionReference('foo;'); - assertResolvedNodeText(reference, r''' + var node = result.findNode.functionReference('foo;'); + assertResolvedNodeText(node, r''' FunctionReference function: SimpleIdentifier token: foo @@ -3838,8 +3825,8 @@ void bar() { } '''); - var reference = result.findNode.functionReference('foo;'); - assertResolvedNodeText(reference, r''' + var node = result.findNode.functionReference('foo;'); + assertResolvedNodeText(node, r''' FunctionReference function: PrefixedIdentifier prefix: SimpleIdentifier @@ -3882,8 +3869,8 @@ void bar() { } '''); - var reference = result.findNode.functionReference('foo'); - assertResolvedNodeText(reference, r''' + var node = result.findNode.functionReference('foo'); + assertResolvedNodeText(node, r''' FunctionReference function: PrefixedIdentifier prefix: SimpleIdentifier @@ -3920,7 +3907,8 @@ bar() { } '''); - assertResolvedNodeText(result.findNode.functionReference('foo;'), r''' + var node = result.findNode.functionReference('foo;'); + assertResolvedNodeText(node, r''' FunctionReference function: PrefixedIdentifier prefix: SimpleIdentifier @@ -3995,7 +3983,8 @@ void bar() { } '''); - assertResolvedNodeText(result.findNode.functionReference('foo'), r''' + var node = result.findNode.functionReference('foo'); + assertResolvedNodeText(node, r''' FunctionReference function: SimpleIdentifier token: foo @@ -4111,7 +4100,8 @@ var a = Cb.foo; // [diag.undefinedGetter] The getter 'foo' isn't defined for the type 'Type'. '''); - assertResolvedNodeText(result.findNode.functionReference('foo;'), r''' + var node = result.findNode.functionReference('foo;'); + assertResolvedNodeText(node, r''' FunctionReference function: PrefixedIdentifier prefix: SimpleIdentifier @@ -4146,7 +4136,8 @@ var a = T.foo; // [diag.undefinedGetter] The getter 'foo' isn't defined for the type 'Type'. '''); - assertResolvedNodeText(result.findNode.functionReference('foo;'), r''' + var node = result.findNode.functionReference('foo;'); + assertResolvedNodeText(node, r''' FunctionReference function: PrefixedIdentifier prefix: SimpleIdentifier @@ -4181,7 +4172,8 @@ void bar() { } '''); - assertResolvedNodeText(result.findNode.functionReference('foo;'), r''' + var node = result.findNode.functionReference('foo;'); + assertResolvedNodeText(node, r''' FunctionReference function: SimpleIdentifier token: foo @@ -4212,7 +4204,8 @@ class B { } '''); - assertResolvedNodeText(result.findNode.functionReference('foo;'), r''' + var node = result.findNode.functionReference('foo;'); + assertResolvedNodeText(node, r''' FunctionReference function: PrefixedIdentifier prefix: SimpleIdentifier @@ -4250,7 +4243,8 @@ void bar() { } '''); - assertResolvedNodeText(result.findNode.functionReference('foo;'), r''' + var node = result.findNode.functionReference('foo;'); + assertResolvedNodeText(node, r''' FunctionReference function: PrefixedIdentifier prefix: SimpleIdentifier @@ -4287,9 +4281,8 @@ void Function(int) foo(void Function(T) f) { } '''); - assertResolvedNodeText( - result.findNode.functionReference('as void Function(T);'), - r''' + var node = result.findNode.functionReference('as void Function(T);'); + assertResolvedNodeText(node, r''' FunctionReference function: AsExpression expression: ParenthesizedExpression @@ -4346,8 +4339,7 @@ FunctionReference staticType: void Function(int) typeArgumentTypes int -''', - ); +'''); } test_assignmentExpression() async { @@ -4358,7 +4350,8 @@ void Function(int) foo(void Function(T) f) { } '''); - assertResolvedNodeText(result.findNode.functionReference('g = f;'), r''' + var node = result.findNode.functionReference('g = f;'); + assertResolvedNodeText(node, r''' FunctionReference function: AssignmentExpression leftHandSide: SimpleIdentifier @@ -4396,7 +4389,8 @@ void Function(int) foo(void Function(T) f) { } '''); - assertResolvedNodeText(result.findNode.functionReference('f += 1'), r''' + var node = result.findNode.functionReference('f += 1'); + assertResolvedNodeText(node, r''' FunctionReference function: AssignmentExpression leftHandSide: SimpleIdentifier @@ -4427,7 +4421,8 @@ Future foo(Future(T)> f) async { } '''); - assertResolvedNodeText(result.findNode.functionReference('await f'), r''' + var node = result.findNode.functionReference('await f'); + assertResolvedNodeText(node, r''' FunctionReference function: AwaitExpression awaitKeyword: await @@ -4455,7 +4450,8 @@ void Function(int) foo(C c) { } '''); - assertResolvedNodeText(result.findNode.functionReference('c + 1'), r''' + var node = result.findNode.functionReference('c + 1'); + assertResolvedNodeText(node, r''' FunctionReference function: BinaryExpression leftOperand: SimpleIdentifier @@ -4483,9 +4479,8 @@ void Function(int) foo(void Function(T) f) { } '''); - assertResolvedNodeText( - result.findNode.functionReference('f..toString()'), - r''' + var node = result.findNode.functionReference('f..toString()'); + assertResolvedNodeText(node, r''' FunctionReference function: SimpleIdentifier token: f @@ -4494,8 +4489,7 @@ FunctionReference staticType: void Function(int) typeArgumentTypes int -''', - ); +'''); } test_constructorReference() async { @@ -4510,7 +4504,8 @@ C Function(int) foo() { // TODO(srawlins): Leave the constructor reference uninstantiated, then // perform generic function instantiation as a wrapping node. - assertResolvedNodeText(result.findNode.constructorReference('C.new'), r''' + var node = result.findNode.constructorReference('C.new'); + assertResolvedNodeText(node, r''' ConstructorReference constructorName: ConstructorName type: NamedType @@ -4536,9 +4531,8 @@ Null Function(int) foo() { } '''); - assertResolvedNodeText( - result.findNode.functionReference('(T a) {};'), - r''' + var node = result.findNode.functionReference('(T a) {};'); + assertResolvedNodeText(node, r''' FunctionReference function: FunctionExpression typeParameters: TypeParameterList @@ -4572,8 +4566,7 @@ FunctionReference staticType: Null Function(int) typeArgumentTypes int -''', - ); +'''); } test_functionExpressionInvocation() async { @@ -4583,7 +4576,8 @@ void Function(int) foo(void Function(T) Function() f) { } '''); - assertResolvedNodeText(result.findNode.functionReference('(f)()'), r''' + var node = result.findNode.functionReference('(f)()'); + assertResolvedNodeText(node, r''' FunctionReference function: FunctionExpressionInvocation function: ParenthesizedExpression @@ -4615,7 +4609,8 @@ void Function(int) foo(Fn f) { } '''); - assertResolvedNodeText(result.findNode.functionReference('f;'), r''' + var node = result.findNode.functionReference('f;'); + assertResolvedNodeText(node, r''' FunctionReference function: SimpleIdentifier token: f @@ -4660,7 +4655,8 @@ void Function(int) foo(List(T)> f) { } '''); - assertResolvedNodeText(result.findNode.functionReference('f[0];'), r''' + var node = result.findNode.functionReference('f[0];'); + assertResolvedNodeText(node, r''' FunctionReference function: IndexExpression target: SimpleIdentifier @@ -4697,7 +4693,8 @@ void Function(int) foo(C c) { } '''); - assertResolvedNodeText(result.findNode.functionReference('c.m();'), r''' + var node = result.findNode.functionReference('c.m();'); + assertResolvedNodeText(node, r''' FunctionReference function: MethodInvocation target: SimpleIdentifier @@ -4733,7 +4730,8 @@ void Function(int) foo(void Function(T) f) { } '''); - assertResolvedNodeText(result.findNode.functionReference('f++'), r''' + var node = result.findNode.functionReference('f++'); + assertResolvedNodeText(node, r''' FunctionReference function: PostfixExpression operand: SimpleIdentifier @@ -4764,7 +4762,8 @@ void Function(int) foo(C c) { } '''); - assertResolvedNodeText(result.findNode.functionReference('c.f;'), r''' + var node = result.findNode.functionReference('c.f;'); + assertResolvedNodeText(node, r''' FunctionReference function: PrefixedIdentifier prefix: SimpleIdentifier @@ -4797,7 +4796,8 @@ void Function(int) foo(void Function(T) f) { } '''); - assertResolvedNodeText(result.findNode.functionReference('++f'), r''' + var node = result.findNode.functionReference('++f'); + assertResolvedNodeText(node, r''' FunctionReference function: PrefixExpression operator: ++ @@ -4828,7 +4828,8 @@ void Function(int) foo(C c) { } '''); - assertResolvedNodeText(result.findNode.functionReference('(c).f;'), r''' + var node = result.findNode.functionReference('(c).f;'); + assertResolvedNodeText(node, r''' FunctionReference function: PropertyAccess target: ParenthesizedExpression @@ -4858,7 +4859,8 @@ void Function(int) foo(void Function(T) f) { } '''); - assertResolvedNodeText(result.findNode.functionReference('f;'), r''' + var node = result.findNode.functionReference('f;'); + assertResolvedNodeText(node, r''' FunctionReference function: SimpleIdentifier token: f @@ -4887,8 +4889,8 @@ void bar(void Function(T a) foo) { } '''); - var reference = result.findNode.functionReference('foo;'); - assertResolvedNodeText(reference, r''' + var node = result.findNode.functionReference('foo;'); + assertResolvedNodeText(node, r''' FunctionReference function: SimpleIdentifier token: foo diff --git a/pkg/analyzer/test/src/dart/resolution/generic_function_type_test.dart b/pkg/analyzer/test/src/dart/resolution/generic_function_type_test.dart index c585065b0ef..598862d1bdd 100644 --- a/pkg/analyzer/test/src/dart/resolution/generic_function_type_test.dart +++ b/pkg/analyzer/test/src/dart/resolution/generic_function_type_test.dart @@ -69,8 +69,8 @@ const a = 42; Function<@a T>()? x; '''); - var T = result.findNode.typeParameter('T'); - assertResolvedNodeText(T, r''' + var node = result.findNode.typeParameter('T'); + assertResolvedNodeText(node, r''' TypeParameter metadata Annotation diff --git a/pkg/analyzer/test/src/dart/resolution/if_statement_test.dart b/pkg/analyzer/test/src/dart/resolution/if_statement_test.dart index 95862f36ece..6537636c576 100644 --- a/pkg/analyzer/test/src/dart/resolution/if_statement_test.dart +++ b/pkg/analyzer/test/src/dart/resolution/if_statement_test.dart @@ -1362,7 +1362,8 @@ f(bool b) { } '''); - assertResolvedNodeText(result.findNode.ifStatement('if (x is int) {'), r''' + var node1 = result.findNode.ifStatement('if (x is int) {'); + assertResolvedNodeText(node1, r''' IfStatement ifKeyword: if leftParenthesis: ( @@ -1424,7 +1425,8 @@ f(bool b) { } '''); - assertResolvedNodeText(result.findNode.ifStatement('if (x is int) {'), r''' + var node2 = result.findNode.ifStatement('if (x is int) {'); + assertResolvedNodeText(node2, r''' IfStatement ifKeyword: if leftParenthesis: ( @@ -1486,7 +1488,8 @@ f(bool b) { } '''); - assertResolvedNodeText(result.findNode.ifStatement('if (x != null) {'), r''' + var node3 = result.findNode.ifStatement('if (x != null) {'); + assertResolvedNodeText(node3, r''' IfStatement ifKeyword: if leftParenthesis: ( @@ -1550,7 +1553,8 @@ f(bool b) { } '''); - assertResolvedNodeText(result.findNode.ifStatement('if (x != null) {'), r''' + var node4 = result.findNode.ifStatement('if (x != null) {'); + assertResolvedNodeText(node4, r''' IfStatement ifKeyword: if leftParenthesis: ( diff --git a/pkg/analyzer/test/src/dart/resolution/index_expression_test.dart b/pkg/analyzer/test/src/dart/resolution/index_expression_test.dart index fc50f7ca479..960807be928 100644 --- a/pkg/analyzer/test/src/dart/resolution/index_expression_test.dart +++ b/pkg/analyzer/test/src/dart/resolution/index_expression_test.dart @@ -152,7 +152,8 @@ void f({a = b?[0]}) {} '''); // TODO(scheglov): https://github.com/dart-lang/sdk/issues/49101 - assertResolvedNodeText(result.findNode.index('[0]'), r''' + var node = result.findNode.index('[0]'); + assertResolvedNodeText(node, r''' IndexExpression target: SimpleIdentifier token: b @@ -175,7 +176,8 @@ IndexExpression typedef void F({a = b?[0]}); '''); - assertResolvedNodeText(result.findNode.index('[0]'), r''' + var node = result.findNode.index('[0]'); + assertResolvedNodeText(node, r''' IndexExpression target: SimpleIdentifier token: b @@ -204,8 +206,8 @@ void f(A a) { } '''); - var indexExpression = result.findNode.index('a[0]'); - assertResolvedNodeText(indexExpression, r''' + var node = result.findNode.index('a[0]'); + assertResolvedNodeText(node, r''' IndexExpression target: SimpleIdentifier token: a @@ -233,7 +235,8 @@ void f(A? a) { } '''); - assertResolvedNodeText(result.findNode.index('..[0]'), r''' + var node1 = result.findNode.index('..[0]'); + assertResolvedNodeText(node1, r''' IndexExpression period: ?.. leftBracket: [ @@ -246,7 +249,8 @@ IndexExpression staticType: bool '''); - assertResolvedNodeText(result.findNode.index('..[1]'), r''' + var node2 = result.findNode.index('..[1]'); + assertResolvedNodeText(node2, r''' IndexExpression period: .. leftBracket: [ @@ -273,8 +277,8 @@ void f(A a) { } '''); - var indexExpression = result.findNode.index('a[0]'); - assertResolvedNodeText(indexExpression, r''' + var node = result.findNode.index('a[0]'); + assertResolvedNodeText(node, r''' IndexExpression target: SimpleIdentifier token: a @@ -367,8 +371,8 @@ void f(A? a) { } '''); - var indexExpression = result.findNode.index('a?[0]'); - assertResolvedNodeText(indexExpression, r''' + var node = result.findNode.index('a?[0]'); + assertResolvedNodeText(node, r''' IndexExpression target: SimpleIdentifier token: a @@ -397,8 +401,8 @@ void f() { } '''); - var indexExpression = result.findNode.singleIndexExpression; - assertResolvedNodeText(indexExpression, r''' + var node = result.findNode.singleIndexExpression; + assertResolvedNodeText(node, r''' IndexExpression target: IntegerLiteral literal: 0 @@ -427,8 +431,8 @@ augment extension E { } '''); - var indexExpression = result.findNode.singleIndexExpression; - assertResolvedNodeText(indexExpression, r''' + var node = result.findNode.singleIndexExpression; + assertResolvedNodeText(node, r''' IndexExpression target: IntegerLiteral literal: 0 @@ -564,8 +568,8 @@ void f(A a) { } '''); - var assignment = result.findNode.assignment('a[0]'); - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('a[0]'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: IndexExpression target: SimpleIdentifier @@ -606,9 +610,8 @@ void f(A a) { } '''); - var assignment = result.findNode.assignment('a[0]'); - - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('a[0]'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: IndexExpression target: SimpleIdentifier @@ -655,9 +658,8 @@ void f(A? a) { } '''); - var assignment = result.findNode.assignment('a?[0]'); - - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('a?[0]'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: IndexExpression target: SimpleIdentifier @@ -737,9 +739,8 @@ void f(A a) { } '''); - var assignment = result.findNode.assignment('a[0]'); - - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('a[0]'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: IndexExpression target: SimpleIdentifier @@ -848,9 +849,8 @@ void f(A a) { } '''); - var assignment = result.findNode.assignment('a[0]'); - - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('a[0]'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: IndexExpression target: SimpleIdentifier @@ -896,9 +896,8 @@ void f(A? a) { } '''); - var assignment = result.findNode.assignment('a?[0]'); - - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('a?[0]'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: IndexExpression target: SimpleIdentifier @@ -939,8 +938,8 @@ void f() { } '''); - var indexExpression = result.findNode.singleAssignmentExpression; - assertResolvedNodeText(indexExpression, r''' + var node = result.findNode.singleAssignmentExpression; + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: IndexExpression target: IntegerLiteral @@ -988,8 +987,8 @@ void f() { } '''); - var indexExpression = result.findNode.singleAssignmentExpression; - assertResolvedNodeText(indexExpression, r''' + var node = result.findNode.singleAssignmentExpression; + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: IndexExpression target: IntegerLiteral diff --git a/pkg/analyzer/test/src/dart/resolution/local_variable_test.dart b/pkg/analyzer/test/src/dart/resolution/local_variable_test.dart index 0dc72b79eb6..15b9b30e6a2 100644 --- a/pkg/analyzer/test/src/dart/resolution/local_variable_test.dart +++ b/pkg/analyzer/test/src/dart/resolution/local_variable_test.dart @@ -144,7 +144,8 @@ void f(bool c) { } '''); - assertResolvedNodeText(result.findNode.simple('a; // ref'), r''' + var node = result.findNode.simple('a; // ref'); + assertResolvedNodeText(node, r''' SimpleIdentifier token: a element: a@71 diff --git a/pkg/analyzer/test/src/dart/resolution/metadata_test.dart b/pkg/analyzer/test/src/dart/resolution/metadata_test.dart index b74a402f7d4..0703fb2e439 100644 --- a/pkg/analyzer/test/src/dart/resolution/metadata_test.dart +++ b/pkg/analyzer/test/src/dart/resolution/metadata_test.dart @@ -25,8 +25,8 @@ const a = 42; List f() => []; '''); - var annotation = result.findNode.annotation('@a'); - assertResolvedNodeText(annotation, r''' + var node = result.findNode.annotation('@a'); + assertResolvedNodeText(node, r''' Annotation atSign: @ name: SimpleIdentifier @@ -35,7 +35,7 @@ Annotation staticType: null element: ::@getter::a '''); - _assertAnnotationValueText(annotation, ''' + _assertAnnotationValueText(node, ''' int 42 variable: ::@topLevelVariable::a '''); @@ -98,8 +98,8 @@ enum E { } '''); - var annotation = result.findNode.annotation('@v'); - assertResolvedNodeText(annotation, ''' + var node = result.findNode.annotation('@v'); + assertResolvedNodeText(node, ''' Annotation atSign: @ name: SimpleIdentifier @@ -109,7 +109,7 @@ Annotation element: ::@enum::E::@getter::v '''); - _assertAnnotationValueText(annotation, ''' + _assertAnnotationValueText(node, ''' E _name: String v index: int 0 @@ -141,8 +141,8 @@ class B { B({@A( A(0) ) required this.f}); } '''); - var annotation = result.findNode.annotation('@A'); - assertResolvedNodeText(annotation, r''' + var node = result.findNode.annotation('@A'); + assertResolvedNodeText(node, r''' Annotation atSign: @ name: SimpleIdentifier @@ -172,7 +172,7 @@ Annotation rightParenthesis: ) element: ::@class::A::@constructor::new '''); - _assertAnnotationValueText(annotation, r''' + _assertAnnotationValueText(node, r''' A f: A f: int 0 @@ -263,8 +263,8 @@ void f() { } '''); - var annotation = result.findNode.annotation('@A'); - assertResolvedNodeText(annotation, ''' + var node = result.findNode.annotation('@A'); + assertResolvedNodeText(node, ''' Annotation atSign: @ name: SimpleIdentifier @@ -467,8 +467,8 @@ class A { void f() {} '''); - var annotation = result.findNode.annotation('@A'); - assertResolvedNodeText(annotation, r''' + var node = result.findNode.annotation('@A'); + assertResolvedNodeText(node, r''' Annotation atSign: @ name: PrefixedIdentifier @@ -493,7 +493,7 @@ Annotation rightParenthesis: ) element: ::@class::A::@constructor::named '''); - _assertAnnotationValueText(annotation, ''' + _assertAnnotationValueText(node, ''' A f: int 42 constructorInvocation @@ -601,8 +601,8 @@ class A { void f() {} '''); - var annotation = result.findNode.annotation('@A'); - assertResolvedNodeText(annotation, r''' + var node = result.findNode.annotation('@A'); + assertResolvedNodeText(node, r''' Annotation atSign: @ name: PrefixedIdentifier @@ -619,7 +619,7 @@ Annotation staticType: null element: ::@class::A::@getter::foo '''); - _assertAnnotationValueText(annotation, ''' + _assertAnnotationValueText(node, ''' int 42 variable: ::@class::A::@field::foo '''); @@ -807,8 +807,8 @@ class A { void f() {} '''); - var annotation = result.findNode.annotation('@A'); - assertResolvedNodeText(annotation, r''' + var node = result.findNode.annotation('@A'); + assertResolvedNodeText(node, r''' Annotation atSign: @ name: PrefixedIdentifier @@ -842,7 +842,7 @@ Annotation baseElement: ::@class::A::@constructor::named substitution: {T: Object?} '''); - _assertAnnotationValueText(annotation, ''' + _assertAnnotationValueText(node, ''' A f: List elementType: List @@ -867,8 +867,8 @@ A void f() {} '''); - var annotation = result.findNode.annotation('@A'); - assertResolvedNodeText(annotation, r''' + var node = result.findNode.annotation('@A'); + assertResolvedNodeText(node, r''' Annotation atSign: @ name: SimpleIdentifier @@ -890,7 +890,7 @@ Annotation baseElement: ::@class::A::@constructor::new substitution: {T: Object?} '''); - _assertAnnotationValueText(annotation, r''' + _assertAnnotationValueText(node, r''' A f: List elementType: List @@ -915,8 +915,8 @@ class A { void f() {} '''); - var annotation = result.findNode.annotation('@A'); - assertResolvedNodeText(annotation, r''' + var node = result.findNode.annotation('@A'); + assertResolvedNodeText(node, r''' Annotation atSign: @ name: PrefixedIdentifier @@ -949,7 +949,7 @@ Annotation baseElement: ::@class::A::@constructor::named substitution: {T: int} '''); - _assertAnnotationValueText(annotation, ''' + _assertAnnotationValueText(node, ''' A f: int 42 constructorInvocation @@ -972,8 +972,8 @@ A void f() {} '''); - var annotation = result.findNode.annotation('@A'); - assertResolvedNodeText(annotation, r''' + var node = result.findNode.annotation('@A'); + assertResolvedNodeText(node, r''' Annotation atSign: @ name: SimpleIdentifier @@ -994,7 +994,7 @@ Annotation baseElement: ::@class::A::@constructor::new substitution: {T: int} '''); - _assertAnnotationValueText(annotation, r''' + _assertAnnotationValueText(node, r''' A f: int 42 constructorInvocation @@ -1016,7 +1016,8 @@ class A { void f() {} '''); - assertResolvedNodeText(result.findNode.annotation('@A'), r''' + var node = result.findNode.annotation('@A'); + assertResolvedNodeText(node, r''' Annotation atSign: @ name: PrefixedIdentifier @@ -1046,8 +1047,8 @@ class A { void f() {} '''); - var annotation = result.findNode.annotation('@A'); - assertResolvedNodeText(annotation, r''' + var node = result.findNode.annotation('@A'); + assertResolvedNodeText(node, r''' Annotation atSign: @ name: PrefixedIdentifier @@ -1080,7 +1081,7 @@ Annotation baseElement: ::@class::A::@constructor::named substitution: {T: dynamic} '''); - _assertAnnotationValueText(annotation, ''' + _assertAnnotationValueText(node, ''' A f: int 42 constructorInvocation @@ -1102,8 +1103,8 @@ class A { void f() {} '''); - var annotation = result.findNode.annotation('@A'); - assertResolvedNodeText(annotation, r''' + var node = result.findNode.annotation('@A'); + assertResolvedNodeText(node, r''' Annotation atSign: @ name: PrefixedIdentifier @@ -1120,7 +1121,7 @@ Annotation staticType: null element: ::@class::A::@getter::foo '''); - _assertAnnotationValueText(annotation, ''' + _assertAnnotationValueText(node, ''' '''); } @@ -1136,8 +1137,8 @@ class A { void f() {} '''); - var annotation = result.findNode.annotation('@A'); - assertResolvedNodeText(annotation, r''' + var node = result.findNode.annotation('@A'); + assertResolvedNodeText(node, r''' Annotation atSign: @ name: SimpleIdentifier @@ -1173,7 +1174,7 @@ Annotation baseElement: ::@class::A::@constructor::named substitution: {T: int} '''); - _assertAnnotationValueText(annotation, ''' + _assertAnnotationValueText(node, ''' A f: int 42 constructorInvocation @@ -1196,8 +1197,8 @@ A void f() {} '''); - var annotation = result.findNode.annotation('@A'); - assertResolvedNodeText(annotation, r''' + var node = result.findNode.annotation('@A'); + assertResolvedNodeText(node, r''' Annotation atSign: @ name: SimpleIdentifier @@ -1226,7 +1227,7 @@ Annotation baseElement: ::@class::A::@constructor::new substitution: {T: int} '''); - _assertAnnotationValueText(annotation, r''' + _assertAnnotationValueText(node, r''' A f: int 42 constructorInvocation @@ -1250,8 +1251,8 @@ class A { void f() {} '''); - var annotation = result.findNode.annotation('@A'); - assertResolvedNodeText(annotation, r''' + var node = result.findNode.annotation('@A'); + assertResolvedNodeText(node, r''' Annotation atSign: @ name: SimpleIdentifier @@ -1272,7 +1273,7 @@ Annotation baseElement: ::@class::A::@constructor::new substitution: {T: dynamic} '''); - _assertAnnotationValueText(annotation, r''' + _assertAnnotationValueText(node, r''' A f: int 42 constructorInvocation @@ -1299,8 +1300,8 @@ class B = A with M; void f() {} '''); - var annotation = result.findNode.annotation('@B'); - assertResolvedNodeText(annotation, r''' + var node = result.findNode.annotation('@B'); + assertResolvedNodeText(node, r''' Annotation atSign: @ name: SimpleIdentifier @@ -1321,7 +1322,7 @@ Annotation baseElement: ::@class::B::@constructor::new substitution: {T: int} '''); - _assertAnnotationValueText(annotation, r''' + _assertAnnotationValueText(node, r''' B (super): A f: int 42 @@ -1358,8 +1359,8 @@ class D {} mixin E {} '''); - var annotation = result.findNode.annotation('@B'); - assertResolvedNodeText(annotation, r''' + var node = result.findNode.annotation('@B'); + assertResolvedNodeText(node, r''' Annotation atSign: @ name: SimpleIdentifier @@ -1380,7 +1381,7 @@ Annotation baseElement: ::@class::B::@constructor::new substitution: {T: int} '''); - _assertAnnotationValueText(annotation, r''' + _assertAnnotationValueText(node, r''' B (super): A f: int 42 @@ -1414,8 +1415,8 @@ class B = A with M; typedef T F(); '''); - var annotation = result.findNode.annotation('@B'); - assertResolvedNodeText(annotation, r''' + var node = result.findNode.annotation('@B'); + assertResolvedNodeText(node, r''' Annotation atSign: @ name: SimpleIdentifier @@ -1436,7 +1437,7 @@ Annotation baseElement: ::@class::B::@constructor::new substitution: {T: int} '''); - _assertAnnotationValueText(annotation, r''' + _assertAnnotationValueText(node, r''' B (super): A f: int 42 @@ -1469,8 +1470,8 @@ class B = A with M; f(@B(42) g()) {} '''); - var annotation = result.findNode.annotation('@B'); - assertResolvedNodeText(annotation, r''' + var node = result.findNode.annotation('@B'); + assertResolvedNodeText(node, r''' Annotation atSign: @ name: SimpleIdentifier @@ -1491,7 +1492,7 @@ Annotation baseElement: ::@class::B::@constructor::new substitution: {T: int} '''); - _assertAnnotationValueText(annotation, r''' + _assertAnnotationValueText(node, r''' B (super): A f: int 42 @@ -1525,8 +1526,8 @@ class B = A with M; typedef F = void Function(); '''); - var annotation = result.findNode.annotation('@B'); - assertResolvedNodeText(annotation, r''' + var node = result.findNode.annotation('@B'); + assertResolvedNodeText(node, r''' Annotation atSign: @ name: SimpleIdentifier @@ -1547,7 +1548,7 @@ Annotation baseElement: ::@class::B::@constructor::new substitution: {T: int} '''); - _assertAnnotationValueText(annotation, r''' + _assertAnnotationValueText(node, r''' B (super): A f: int 42 @@ -1583,8 +1584,8 @@ class C { } '''); - var annotation = result.findNode.annotation('@B'); - assertResolvedNodeText(annotation, r''' + var node = result.findNode.annotation('@B'); + assertResolvedNodeText(node, r''' Annotation atSign: @ name: SimpleIdentifier @@ -1605,7 +1606,7 @@ Annotation baseElement: ::@class::B::@constructor::new substitution: {T: int} '''); - _assertAnnotationValueText(annotation, r''' + _assertAnnotationValueText(node, r''' B (super): A f: int 42 @@ -1639,8 +1640,8 @@ class B = A with M; void f() {} '''); - var annotation = result.findNode.annotation('@B'); - assertResolvedNodeText(annotation, r''' + var node = result.findNode.annotation('@B'); + assertResolvedNodeText(node, r''' Annotation atSign: @ name: SimpleIdentifier @@ -1669,7 +1670,7 @@ Annotation baseElement: ::@class::B::@constructor::new substitution: {T: int} '''); - _assertAnnotationValueText(annotation, r''' + _assertAnnotationValueText(node, r''' B (super): A f: int 42 @@ -2002,8 +2003,8 @@ import 'a.dart' as prefix; void f() {} '''); - var annotation = result.findNode.annotation('@prefix.B'); - assertResolvedNodeText(annotation, r''' + var node = result.findNode.annotation('@prefix.B'); + assertResolvedNodeText(node, r''' Annotation atSign: @ name: PrefixedIdentifier @@ -2025,7 +2026,7 @@ Annotation staticType: null element: package:test/a.dart::@class::A::@getter::foo '''); - _assertAnnotationValueText(annotation, ''' + _assertAnnotationValueText(node, ''' int 42 variable: package:test/a.dart::@class::A::@field::foo '''); @@ -2047,8 +2048,8 @@ import 'a.dart' as prefix; void f() {} '''); - var annotation = result.findNode.annotation('@prefix.B'); - assertResolvedNodeText(annotation, r''' + var node = result.findNode.annotation('@prefix.B'); + assertResolvedNodeText(node, r''' Annotation atSign: @ name: PrefixedIdentifier @@ -2084,7 +2085,7 @@ Annotation baseElement: package:test/a.dart::@class::A::@constructor::named substitution: {T: int} '''); - _assertAnnotationValueText(annotation, r''' + _assertAnnotationValueText(node, r''' A f: int 42 constructorInvocation @@ -2112,8 +2113,8 @@ import 'a.dart' as prefix; void f() {} '''); - var annotation = result.findNode.annotation('@prefix.B'); - assertResolvedNodeText(annotation, r''' + var node = result.findNode.annotation('@prefix.B'); + assertResolvedNodeText(node, r''' Annotation atSign: @ name: PrefixedIdentifier @@ -2142,7 +2143,7 @@ Annotation baseElement: package:test/a.dart::@class::A::@constructor::new substitution: {T: int} '''); - _assertAnnotationValueText(annotation, r''' + _assertAnnotationValueText(node, r''' A f: int 42 constructorInvocation @@ -2170,8 +2171,8 @@ import 'a.dart' as prefix; void f() {} '''); - var annotation = result.findNode.annotation('@prefix.B'); - assertResolvedNodeText(annotation, r''' + var node = result.findNode.annotation('@prefix.B'); + assertResolvedNodeText(node, r''' Annotation atSign: @ name: PrefixedIdentifier @@ -2215,7 +2216,7 @@ Annotation baseElement: package:test/a.dart::@class::A::@constructor::named substitution: {T: int} '''); - _assertAnnotationValueText(annotation, r''' + _assertAnnotationValueText(node, r''' A f: int 42 constructorInvocation @@ -2243,8 +2244,8 @@ import 'a.dart' as prefix; void f() {} '''); - var annotation = result.findNode.annotation('@prefix.B'); - assertResolvedNodeText(annotation, r''' + var node = result.findNode.annotation('@prefix.B'); + assertResolvedNodeText(node, r''' Annotation atSign: @ name: PrefixedIdentifier @@ -2281,7 +2282,7 @@ Annotation baseElement: package:test/a.dart::@class::A::@constructor::new substitution: {T: int} '''); - _assertAnnotationValueText(annotation, r''' + _assertAnnotationValueText(node, r''' A f: int 42 constructorInvocation @@ -2316,8 +2317,8 @@ typedef B = A; void f() {} '''); - var annotation = result.findNode.annotation('@B'); - assertResolvedNodeText(annotation, r''' + var node = result.findNode.annotation('@B'); + assertResolvedNodeText(node, r''' Annotation atSign: @ name: PrefixedIdentifier @@ -2334,7 +2335,7 @@ Annotation staticType: null element: ::@class::A::@getter::foo '''); - _assertAnnotationValueText(annotation, ''' + _assertAnnotationValueText(node, ''' int 42 variable: ::@class::A::@field::foo '''); @@ -2354,8 +2355,8 @@ typedef B = A; void f() {} '''); - var annotation = result.findNode.annotation('@B'); - assertResolvedNodeText(annotation, r''' + var node = result.findNode.annotation('@B'); + assertResolvedNodeText(node, r''' Annotation atSign: @ name: SimpleIdentifier @@ -2397,7 +2398,7 @@ Annotation baseElement: ::@class::A::@constructor::named substitution: {T: int, U: double} '''); - _assertAnnotationValueText(annotation, r''' + _assertAnnotationValueText(node, r''' A t: int 42 u: double 1.2 @@ -2425,8 +2426,8 @@ typedef B = A; void f() {} '''); - var annotation = result.findNode.annotation('@B'); - assertResolvedNodeText(annotation, r''' + var node = result.findNode.annotation('@B'); + assertResolvedNodeText(node, r''' Annotation atSign: @ name: SimpleIdentifier @@ -2461,7 +2462,7 @@ Annotation baseElement: ::@class::A::@constructor::new substitution: {T: int, U: double} '''); - _assertAnnotationValueText(annotation, r''' + _assertAnnotationValueText(node, r''' A t: int 42 u: double 1.2 @@ -2488,8 +2489,8 @@ typedef B = A; void f() {} '''); - var annotation = result.findNode.annotation('@B'); - assertResolvedNodeText(annotation, r''' + var node = result.findNode.annotation('@B'); + assertResolvedNodeText(node, r''' Annotation atSign: @ name: PrefixedIdentifier @@ -2522,7 +2523,7 @@ Annotation baseElement: ::@class::A::@constructor::named substitution: {T: int} '''); - _assertAnnotationValueText(annotation, r''' + _assertAnnotationValueText(node, r''' A f: int 42 constructorInvocation @@ -2547,8 +2548,8 @@ typedef B = A; void f() {} '''); - var annotation = result.findNode.annotation('@B'); - assertResolvedNodeText(annotation, r''' + var node = result.findNode.annotation('@B'); + assertResolvedNodeText(node, r''' Annotation atSign: @ name: SimpleIdentifier @@ -2569,7 +2570,7 @@ Annotation baseElement: ::@class::A::@constructor::new substitution: {T: int} '''); - _assertAnnotationValueText(annotation, r''' + _assertAnnotationValueText(node, r''' A f: int 42 constructorInvocation @@ -2594,8 +2595,8 @@ typedef B = A; void f() {} '''); - var annotation = result.findNode.annotation('@B'); - assertResolvedNodeText(annotation, r''' + var node = result.findNode.annotation('@B'); + assertResolvedNodeText(node, r''' Annotation atSign: @ name: SimpleIdentifier @@ -2631,7 +2632,7 @@ Annotation baseElement: ::@class::A::@constructor::named substitution: {T: int} '''); - _assertAnnotationValueText(annotation, r''' + _assertAnnotationValueText(node, r''' A f: int 42 constructorInvocation @@ -2656,8 +2657,8 @@ typedef B = A; void f() {} '''); - var annotation = result.findNode.annotation('@B'); - assertResolvedNodeText(annotation, r''' + var node = result.findNode.annotation('@B'); + assertResolvedNodeText(node, r''' Annotation atSign: @ name: SimpleIdentifier @@ -2686,7 +2687,7 @@ Annotation baseElement: ::@class::A::@constructor::new substitution: {T: int} '''); - _assertAnnotationValueText(annotation, r''' + _assertAnnotationValueText(node, r''' A f: int 42 constructorInvocation @@ -2711,8 +2712,8 @@ typedef B = A; void f() {} '''); - var annotation = result.findNode.annotation('@B'); - assertResolvedNodeText(annotation, r''' + var node = result.findNode.annotation('@B'); + assertResolvedNodeText(node, r''' Annotation atSign: @ name: PrefixedIdentifier @@ -2745,7 +2746,7 @@ Annotation baseElement: ::@class::A::@constructor::named substitution: {T: int} '''); - _assertAnnotationValueText(annotation, r''' + _assertAnnotationValueText(node, r''' A f: int 42 constructorInvocation @@ -2770,8 +2771,8 @@ typedef B = A; void f() {} '''); - var annotation = result.findNode.annotation('@B'); - assertResolvedNodeText(annotation, r''' + var node = result.findNode.annotation('@B'); + assertResolvedNodeText(node, r''' Annotation atSign: @ name: SimpleIdentifier @@ -2792,7 +2793,7 @@ Annotation baseElement: ::@class::A::@constructor::new substitution: {T: int} '''); - _assertAnnotationValueText(annotation, r''' + _assertAnnotationValueText(node, r''' A f: int 42 constructorInvocation @@ -2817,8 +2818,8 @@ typedef B = A; void f() {} '''); - var annotation = result.findNode.annotation('@B'); - assertResolvedNodeText(annotation, r''' + var node = result.findNode.annotation('@B'); + assertResolvedNodeText(node, r''' Annotation atSign: @ name: PrefixedIdentifier @@ -2843,7 +2844,7 @@ Annotation rightParenthesis: ) element: ::@class::A::@constructor::named '''); - _assertAnnotationValueText(annotation, r''' + _assertAnnotationValueText(node, r''' A f: int 42 constructorInvocation @@ -2866,8 +2867,8 @@ typedef B = A; void f() {} '''); - var annotation = result.findNode.annotation('@B'); - assertResolvedNodeText(annotation, r''' + var node = result.findNode.annotation('@B'); + assertResolvedNodeText(node, r''' Annotation atSign: @ name: SimpleIdentifier @@ -2884,7 +2885,7 @@ Annotation rightParenthesis: ) element: ::@class::A::@constructor::new '''); - _assertAnnotationValueText(annotation, r''' + _assertAnnotationValueText(node, r''' A f: int 42 constructorInvocation diff --git a/pkg/analyzer/test/src/dart/resolution/method_declaration_test.dart b/pkg/analyzer/test/src/dart/resolution/method_declaration_test.dart index fddf2aba327..79597f48713 100644 --- a/pkg/analyzer/test/src/dart/resolution/method_declaration_test.dart +++ b/pkg/analyzer/test/src/dart/resolution/method_declaration_test.dart @@ -148,7 +148,6 @@ class C { } '''); var node = result.findNode.variableDeclaration('_ = _;'); - assertResolvedNodeText(node, r''' VariableDeclaration name: _ diff --git a/pkg/analyzer/test/src/dart/resolution/mixin_test.dart b/pkg/analyzer/test/src/dart/resolution/mixin_test.dart index c0b198c1246..fdd5ee06ee9 100644 --- a/pkg/analyzer/test/src/dart/resolution/mixin_test.dart +++ b/pkg/analyzer/test/src/dart/resolution/mixin_test.dart @@ -439,8 +439,8 @@ mixin M on A { class X extends A with M {} '''); - var assignment = result.findNode.assignment('foo ='); - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('foo ='); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: PropertyAccess target: SuperExpression diff --git a/pkg/analyzer/test/src/dart/resolution/non_nullable_test.dart b/pkg/analyzer/test/src/dart/resolution/non_nullable_test.dart index c9c4c95feb3..640cc7eac34 100644 --- a/pkg/analyzer/test/src/dart/resolution/non_nullable_test.dart +++ b/pkg/analyzer/test/src/dart/resolution/non_nullable_test.dart @@ -249,8 +249,8 @@ void f2(void p2()?) {} void f3({void p3()?}) {} '''); - var p1 = result.findNode.formalParameterList('p1'); - assertResolvedNodeText(p1, r''' + var node1 = result.findNode.formalParameterList('p1'); + assertResolvedNodeText(node1, r''' FormalParameterList leftParenthesis: ( parameter: RegularFormalParameter @@ -269,8 +269,8 @@ FormalParameterList rightParenthesis: ) '''); - var p2 = result.findNode.formalParameterList('p2'); - assertResolvedNodeText(p2, r''' + var node2 = result.findNode.formalParameterList('p2'); + assertResolvedNodeText(node2, r''' FormalParameterList leftParenthesis: ( parameter: RegularFormalParameter @@ -290,8 +290,8 @@ FormalParameterList rightParenthesis: ) '''); - var p3 = result.findNode.formalParameterList('p3'); - assertResolvedNodeText(p3, r''' + var node3 = result.findNode.formalParameterList('p3'); + assertResolvedNodeText(node3, r''' FormalParameterList leftParenthesis: ( leftDelimiter: { @@ -326,8 +326,8 @@ class A { } '''); - var f1 = result.findNode.formalParameterList('f1()'); - assertResolvedNodeText(f1, r''' + var node1 = result.findNode.formalParameterList('f1()'); + assertResolvedNodeText(node1, r''' FormalParameterList leftParenthesis: ( parameter: FieldFormalParameter @@ -349,8 +349,8 @@ FormalParameterList rightParenthesis: ) '''); - var f2 = result.findNode.formalParameterList('f2()'); - assertResolvedNodeText(f2, r''' + var node2 = result.findNode.formalParameterList('f2()'); + assertResolvedNodeText(node2, r''' FormalParameterList leftParenthesis: ( parameter: FieldFormalParameter @@ -373,8 +373,8 @@ FormalParameterList rightParenthesis: ) '''); - var f3 = result.findNode.formalParameterList('f3()'); - assertResolvedNodeText(f3, r''' + var node3 = result.findNode.formalParameterList('f3()'); + assertResolvedNodeText(node3, r''' FormalParameterList leftParenthesis: ( leftDelimiter: { @@ -415,8 +415,8 @@ f() { } '''); - var p1 = result.findNode.formalParameterList('p1'); - assertResolvedNodeText(p1, r''' + var node1 = result.findNode.formalParameterList('p1'); + assertResolvedNodeText(node1, r''' FormalParameterList leftParenthesis: ( parameter: RegularFormalParameter @@ -435,8 +435,8 @@ FormalParameterList rightParenthesis: ) '''); - var p2 = result.findNode.formalParameterList('p2'); - assertResolvedNodeText(p2, r''' + var node2 = result.findNode.formalParameterList('p2'); + assertResolvedNodeText(node2, r''' FormalParameterList leftParenthesis: ( parameter: RegularFormalParameter @@ -456,8 +456,8 @@ FormalParameterList rightParenthesis: ) '''); - var p3 = result.findNode.formalParameterList('p3'); - assertResolvedNodeText(p3, r''' + var node3 = result.findNode.formalParameterList('p3'); + assertResolvedNodeText(node3, r''' FormalParameterList leftParenthesis: ( leftDelimiter: { diff --git a/pkg/analyzer/test/src/dart/resolution/postfix_expression_test.dart b/pkg/analyzer/test/src/dart/resolution/postfix_expression_test.dart index 95e89ce36bc..12bac08c631 100644 --- a/pkg/analyzer/test/src/dart/resolution/postfix_expression_test.dart +++ b/pkg/analyzer/test/src/dart/resolution/postfix_expression_test.dart @@ -27,14 +27,14 @@ f() { } } '''); - var nonPromotedIdentifier = result.findNode.simple('x;'); - assertResolvedNodeText(nonPromotedIdentifier, r''' + var node = result.findNode.simple('x;'); + assertResolvedNodeText(node, r''' SimpleIdentifier token: x element: x@12 staticType: num '''); - assertType(nonPromotedIdentifier, 'num'); + assertType(node, 'num'); } } @@ -542,7 +542,8 @@ void f(A? a) { } '''); - assertResolvedNodeText(result.findNode.postfix('foo++'), r''' + var node = result.findNode.postfix('foo++'); + assertResolvedNodeText(node, r''' PostfixExpression operand: PropertyAccess target: SimpleIdentifier @@ -654,7 +655,8 @@ void f(Object x) { } '''); - assertResolvedNodeText(result.findNode.postfix('x++'), r''' + var node = result.findNode.postfix('x++'); + assertResolvedNodeText(node, r''' PostfixExpression operand: SimpleIdentifier token: x @@ -938,7 +940,8 @@ void f(int? x) { } '''); - assertResolvedNodeText(result.findNode.postfix('x!'), r''' + var node = result.findNode.postfix('x!'); + assertResolvedNodeText(node, r''' PostfixExpression operand: SimpleIdentifier token: x @@ -966,7 +969,8 @@ void f(Map a) { } '''); - assertResolvedNodeText(result.findNode.index('a['), r''' + var node1 = result.findNode.index('a['); + assertResolvedNodeText(node1, r''' IndexExpression target: SimpleIdentifier token: a @@ -982,7 +986,8 @@ IndexExpression staticType: int? '''); - assertResolvedNodeText(result.findNode.postfix(']!'), r''' + var node2 = result.findNode.postfix(']!'); + assertResolvedNodeText(node2, r''' PostfixExpression operand: IndexExpression target: SimpleIdentifier @@ -1207,8 +1212,8 @@ void f(T? x) { } '''); - var postfixExpression = result.findNode.postfix('x!'); - assertResolvedNodeText(postfixExpression, r''' + var node = result.findNode.postfix('x!'); + assertResolvedNodeText(node, r''' PostfixExpression operand: SimpleIdentifier token: x @@ -1229,8 +1234,8 @@ void f(T? x) { } '''); - var postfixExpression = result.findNode.postfix('x!'); - assertResolvedNodeText(postfixExpression, r''' + var node = result.findNode.postfix('x!'); + assertResolvedNodeText(node, r''' PostfixExpression operand: SimpleIdentifier token: x diff --git a/pkg/analyzer/test/src/dart/resolution/prefix_expression_test.dart b/pkg/analyzer/test/src/dart/resolution/prefix_expression_test.dart index 20f95b7cbb9..c0d17f154bc 100644 --- a/pkg/analyzer/test/src/dart/resolution/prefix_expression_test.dart +++ b/pkg/analyzer/test/src/dart/resolution/prefix_expression_test.dart @@ -100,7 +100,8 @@ void f(A? a) { } '''); - assertResolvedNodeText(result.findNode.prefix('!a'), r''' + var node = result.findNode.prefix('!a'); + assertResolvedNodeText(node, r''' PrefixExpression operator: ! operand: PropertyAccess @@ -557,7 +558,8 @@ void f(A? a) { } '''); - assertResolvedNodeText(result.findNode.prefix('-a'), r''' + var node = result.findNode.prefix('-a'); + assertResolvedNodeText(node, r''' PrefixExpression operator: - operand: PropertyAccess @@ -609,7 +611,8 @@ void f(Object x) { } '''); - assertResolvedNodeText(result.findNode.prefix('++x'), r''' + var node = result.findNode.prefix('++x'); + assertResolvedNodeText(node, r''' PrefixExpression operator: ++ operand: SimpleIdentifier @@ -706,7 +709,8 @@ void f(A? a) { } '''); - assertResolvedNodeText(result.findNode.prefix('++a'), r''' + var node = result.findNode.prefix('++a'); + assertResolvedNodeText(node, r''' PrefixExpression operator: ++ operand: PropertyAccess @@ -1322,7 +1326,8 @@ void f(A? a) { } '''); - assertResolvedNodeText(result.findNode.prefix('~a'), r''' + var node = result.findNode.prefix('~a'); + assertResolvedNodeText(node, r''' PrefixExpression operator: ~ operand: PropertyAccess diff --git a/pkg/analyzer/test/src/dart/resolution/prefixed_identifier_test.dart b/pkg/analyzer/test/src/dart/resolution/prefixed_identifier_test.dart index 145a21e853f..dd3daf6caf1 100644 --- a/pkg/analyzer/test/src/dart/resolution/prefixed_identifier_test.dart +++ b/pkg/analyzer/test/src/dart/resolution/prefixed_identifier_test.dart @@ -111,8 +111,8 @@ void f(A a) { } '''); - var assignment = result.findNode.assignment('foo += 1'); - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('foo += 1'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: PrefixedIdentifier prefix: SimpleIdentifier @@ -151,8 +151,8 @@ void f(A a) { } '''); - var assignment = result.findNode.assignment('foo = 1'); - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('foo = 1'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: PrefixedIdentifier prefix: SimpleIdentifier @@ -221,8 +221,8 @@ void f(E e) { } '''); - var assignment = result.findNode.assignment('foo = 1'); - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('foo = 1'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: PrefixedIdentifier prefix: SimpleIdentifier diff --git a/pkg/analyzer/test/src/dart/resolution/property_access_test.dart b/pkg/analyzer/test/src/dart/resolution/property_access_test.dart index ceb85dc187d..e9f2a3d26b0 100644 --- a/pkg/analyzer/test/src/dart/resolution/property_access_test.dart +++ b/pkg/analyzer/test/src/dart/resolution/property_access_test.dart @@ -69,8 +69,8 @@ void f(A a) { } '''); - var assignment = result.findNode.assignment('foo += 1'); - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('foo += 1'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: PropertyAccess target: ExtensionOverride @@ -120,8 +120,8 @@ void f(A a) { } '''); - var assignment = result.findNode.assignment('foo = 1'); - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('foo = 1'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: PropertyAccess target: ExtensionOverride @@ -202,8 +202,8 @@ int Function() foo() { } '''); - var identifier = result.findNode.simple('a; // ref'); - assertResolvedNodeText(identifier, r''' + var node = result.findNode.simple('a; // ref'); + assertResolvedNodeText(node, r''' SimpleIdentifier token: a element: ::@class::B::@getter::a @@ -574,8 +574,8 @@ void f() { } '''); - var assignment = result.findNode.assignment('foo += 1'); - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('foo += 1'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: PropertyAccess target: InstanceCreationExpression @@ -620,8 +620,8 @@ void f() { } '''); - var assignment = result.findNode.assignment('foo = 1'); - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('foo = 1'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: PropertyAccess target: InstanceCreationExpression @@ -1236,8 +1236,8 @@ void f(E e) { } '''); - var assignment = result.findNode.assignment('foo = 1'); - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('foo = 1'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: PropertyAccess target: ParenthesizedExpression @@ -1493,8 +1493,8 @@ void f() { } '''); - var assignment = result.findNode.assignment('foo += 1'); - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('foo += 1'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: PropertyAccess target: InstanceCreationExpression @@ -1541,8 +1541,8 @@ void f() { } '''); - var assignment = result.findNode.assignment('foo = 1'); - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('foo = 1'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: PropertyAccess target: InstanceCreationExpression @@ -2379,8 +2379,8 @@ class B extends A { } '''); - var assignment = result.findNode.assignment('foo += 1'); - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('foo += 1'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: PropertyAccess target: SuperExpression @@ -2419,8 +2419,8 @@ class B extends A { } '''); - var assignment = result.findNode.assignment('foo = 1'); - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('foo = 1'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: PropertyAccess target: SuperExpression @@ -2517,8 +2517,8 @@ bar() { } '''); - var identifier = result.findNode.simple('foo;'); - assertResolvedNodeText(identifier, r''' + var node = result.findNode.simple('foo;'); + assertResolvedNodeText(node, r''' SimpleIdentifier token: foo element: ::@class::A::@method::foo diff --git a/pkg/analyzer/test/src/dart/resolution/simple_identifier_test.dart b/pkg/analyzer/test/src/dart/resolution/simple_identifier_test.dart index d2e1dc7b6d4..056742b1a57 100644 --- a/pkg/analyzer/test/src/dart/resolution/simple_identifier_test.dart +++ b/pkg/analyzer/test/src/dart/resolution/simple_identifier_test.dart @@ -285,8 +285,8 @@ int Function() foo(A a) { } '''); - var identifier = result.findNode.simple('a;'); - assertResolvedNodeText(identifier, r''' + var node = result.findNode.simple('a;'); + assertResolvedNodeText(node, r''' SimpleIdentifier token: a element: ::@function::foo::@formalParameter::a @@ -307,8 +307,8 @@ int Function() foo(A? a) { } '''); - var identifier = result.findNode.simple('a;'); - assertResolvedNodeText(identifier, r''' + var node = result.findNode.simple('a;'); + assertResolvedNodeText(node, r''' SimpleIdentifier token: a element: ::@function::foo::@formalParameter::a @@ -663,8 +663,8 @@ class C { } '''); - var identifier = result.findNode.simple('f;'); - assertResolvedNodeText(identifier, r''' + var node = result.findNode.simple('f;'); + assertResolvedNodeText(node, r''' SimpleIdentifier token: f element: f@50 @@ -681,8 +681,8 @@ main() { } '''); - var identifier = result.findNode.simple('foo;'); - assertResolvedNodeText(identifier, r''' + var node = result.findNode.simple('foo;'); + assertResolvedNodeText(node, r''' SimpleIdentifier token: foo element: ::@function::foo @@ -701,8 +701,8 @@ class A { } '''); - var identifier = result.findNode.simple('foo;'); - assertResolvedNodeText(identifier, r''' + var node = result.findNode.simple('foo;'); + assertResolvedNodeText(node, r''' SimpleIdentifier token: foo element: ::@class::A::@method::foo diff --git a/pkg/analyzer/test/src/dart/resolution/type_inference/extension_methods_test.dart b/pkg/analyzer/test/src/dart/resolution/type_inference/extension_methods_test.dart index 1dab5e17b5a..81cb5f57221 100644 --- a/pkg/analyzer/test/src/dart/resolution/type_inference/extension_methods_test.dart +++ b/pkg/analyzer/test/src/dart/resolution/type_inference/extension_methods_test.dart @@ -212,8 +212,8 @@ void f(A a) { a.foo = 0; } '''); - var assignment = result.findNode.assignment('foo ='); - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('foo ='); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: PrefixedIdentifier prefix: SimpleIdentifier @@ -324,8 +324,8 @@ void f(S x) { } '''); - var assignment = result.findNode.assignment('(x).test'); - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('(x).test'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: PropertyAccess target: ParenthesizedExpression @@ -592,8 +592,8 @@ void f(A a) { } '''); - var assignment = result.findNode.assignment('foo ='); - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('foo ='); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: PropertyAccess target: ExtensionOverride @@ -816,7 +816,8 @@ void f(A a) { } '''); - assertResolvedNodeText(result.findNode.assignment('foo ='), r''' + var node = result.findNode.assignment('foo ='); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: PropertyAccess target: ExtensionOverride diff --git a/pkg/analyzer/test/src/dart/resolution/type_literal_test.dart b/pkg/analyzer/test/src/dart/resolution/type_literal_test.dart index b1d2dc9339e..c5277b6f146 100644 --- a/pkg/analyzer/test/src/dart/resolution/type_literal_test.dart +++ b/pkg/analyzer/test/src/dart/resolution/type_literal_test.dart @@ -7828,8 +7828,8 @@ class C { } '''); - var thenNode = result.findNode.typeLiteral('T: 1'); - assertResolvedNodeText(thenNode, r''' + var node2 = result.findNode.typeLiteral('T: 1'); + assertResolvedNodeText(node2, r''' TypeLiteral type: NamedType name: T @@ -7838,8 +7838,8 @@ TypeLiteral staticType: Type '''); - var elseNode = result.findNode.typeLiteral('Never: 2'); - assertResolvedNodeText(elseNode, r''' + var node3 = result.findNode.typeLiteral('Never: 2'); + assertResolvedNodeText(node3, r''' TypeLiteral type: NamedType name: Never diff --git a/pkg/analyzer/test/src/diagnostics/abstract_super_member_reference_test.dart b/pkg/analyzer/test/src/diagnostics/abstract_super_member_reference_test.dart index c1b8b9a4ace..4f728ff2718 100644 --- a/pkg/analyzer/test/src/diagnostics/abstract_super_member_reference_test.dart +++ b/pkg/analyzer/test/src/diagnostics/abstract_super_member_reference_test.dart @@ -494,7 +494,8 @@ abstract class B extends A { } '''); - assertResolvedNodeText(result.findNode.assignment('foo ='), r''' + var node = result.findNode.assignment('foo ='); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: PropertyAccess target: SuperExpression @@ -535,7 +536,8 @@ mixin M implements A { } '''); - assertResolvedNodeText(result.findNode.assignment('foo ='), r''' + var node = result.findNode.assignment('foo ='); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: PropertyAccess target: SuperExpression @@ -576,7 +578,8 @@ class B extends Object with A { } '''); - assertResolvedNodeText(result.findNode.assignment('foo ='), r''' + var node = result.findNode.assignment('foo ='); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: PropertyAccess target: SuperExpression @@ -616,7 +619,8 @@ class B extends A { } '''); - assertResolvedNodeText(result.findNode.assignment('foo ='), r''' + var node = result.findNode.assignment('foo ='); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: PropertyAccess target: SuperExpression @@ -660,7 +664,8 @@ class C extends B { } '''); - assertResolvedNodeText(result.findNode.assignment('foo ='), r''' + var node = result.findNode.assignment('foo ='); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: PropertyAccess target: SuperExpression diff --git a/pkg/analyzer/test/src/diagnostics/ambiguous_extension_member_access_test.dart b/pkg/analyzer/test/src/diagnostics/ambiguous_extension_member_access_test.dart index df2a431569f..301e77fd9b0 100644 --- a/pkg/analyzer/test/src/diagnostics/ambiguous_extension_member_access_test.dart +++ b/pkg/analyzer/test/src/diagnostics/ambiguous_extension_member_access_test.dart @@ -498,7 +498,8 @@ f() { } '''); - assertResolvedNodeText(result.findNode.assignment('= 3'), r''' + var node = result.findNode.assignment('= 3'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: PropertyAccess target: IntegerLiteral diff --git a/pkg/analyzer/test/src/diagnostics/invalid_assignment_test.dart b/pkg/analyzer/test/src/diagnostics/invalid_assignment_test.dart index 08475277f95..b22e7636f4d 100644 --- a/pkg/analyzer/test/src/diagnostics/invalid_assignment_test.dart +++ b/pkg/analyzer/test/src/diagnostics/invalid_assignment_test.dart @@ -540,7 +540,8 @@ int Function() foo(int Function() f) { } '''); - assertResolvedNodeText(result.findNode.functionReference('f;'), r''' + var node = result.findNode.functionReference('f;'); + assertResolvedNodeText(node, r''' FunctionReference function: SimpleIdentifier token: f diff --git a/pkg/analyzer/test/src/diagnostics/private_setter_test.dart b/pkg/analyzer/test/src/diagnostics/private_setter_test.dart index 98474c7ce99..89e264cabf3 100644 --- a/pkg/analyzer/test/src/diagnostics/private_setter_test.dart +++ b/pkg/analyzer/test/src/diagnostics/private_setter_test.dart @@ -32,8 +32,8 @@ main() { } '''); - var assignment = result.findNode.assignment('_foo ='); - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('_foo ='); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: PrefixedIdentifier prefix: SimpleIdentifier @@ -92,8 +92,8 @@ main() { } '''); - var assignment = result.findNode.assignment('_foo ='); - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('_foo ='); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: PrefixedIdentifier prefix: SimpleIdentifier @@ -137,8 +137,8 @@ main() { } '''); - var assignment = result.findNode.assignment('_foo ='); - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('_foo ='); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: PrefixedIdentifier prefix: SimpleIdentifier diff --git a/pkg/analyzer/test/src/diagnostics/receiver_of_type_never_test.dart b/pkg/analyzer/test/src/diagnostics/receiver_of_type_never_test.dart index 9a66e4c0c79..5081827339e 100644 --- a/pkg/analyzer/test/src/diagnostics/receiver_of_type_never_test.dart +++ b/pkg/analyzer/test/src/diagnostics/receiver_of_type_never_test.dart @@ -27,7 +27,8 @@ void f() { } '''); - assertResolvedNodeText(result.findNode.binary('=='), r''' + var node = result.findNode.binary('=='); + assertResolvedNodeText(node, r''' BinaryExpression leftOperand: ParenthesizedExpression leftParenthesis: ( @@ -69,7 +70,8 @@ void f(Never x) { } '''); - assertResolvedNodeText(result.findNode.binary('x =='), r''' + var node = result.findNode.binary('x =='); + assertResolvedNodeText(node, r''' BinaryExpression leftOperand: SimpleIdentifier token: x @@ -106,7 +108,8 @@ void f(Never x) { } '''); - assertResolvedNodeText(result.findNode.binary('x +'), r''' + var node = result.findNode.binary('x +'); + assertResolvedNodeText(node, r''' BinaryExpression leftOperand: SimpleIdentifier token: x @@ -143,7 +146,8 @@ void f(Never? x) { } '''); - assertResolvedNodeText(result.findNode.binary('x =='), r''' + var node = result.findNode.binary('x =='); + assertResolvedNodeText(node, r''' BinaryExpression leftOperand: SimpleIdentifier token: x @@ -178,7 +182,8 @@ void f(Never? x) { } '''); - assertResolvedNodeText(result.findNode.binary('x +'), r''' + var node = result.findNode.binary('x +'); + assertResolvedNodeText(node, r''' BinaryExpression leftOperand: SimpleIdentifier token: x @@ -219,7 +224,8 @@ void f() { } '''); - assertResolvedNodeText(result.findNode.binary('+ ('), r''' + var node = result.findNode.binary('+ ('); + assertResolvedNodeText(node, r''' BinaryExpression leftOperand: ParenthesizedExpression leftParenthesis: ( @@ -305,7 +311,8 @@ void f(Never x) { } '''); - assertResolvedNodeText(result.findNode.index('x[0]'), r''' + var node = result.findNode.index('x[0]'); + assertResolvedNodeText(node, r''' IndexExpression target: SimpleIdentifier token: x @@ -333,8 +340,8 @@ void f(Never x) { } '''); - var assignment = result.findNode.assignment('[0] +='); - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('[0] +='); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: IndexExpression target: SimpleIdentifier @@ -383,7 +390,8 @@ void f(Never x) { } '''); - assertResolvedNodeText(result.findNode.assignment('x[0]'), r''' + var node = result.findNode.assignment('x[0]'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: IndexExpression target: SimpleIdentifier @@ -430,7 +438,8 @@ void f(Never? x) { } '''); - assertResolvedNodeText(result.findNode.index('x[0]'), r''' + var node = result.findNode.index('x[0]'); + assertResolvedNodeText(node, r''' IndexExpression target: SimpleIdentifier token: x @@ -456,8 +465,8 @@ void f(Never? x) { } '''); - var assignment = result.findNode.assignment('[0] +='); - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('[0] +='); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: IndexExpression target: SimpleIdentifier @@ -504,7 +513,8 @@ void f(Never? x) { } '''); - assertResolvedNodeText(result.findNode.assignment('x[0]'), r''' + var node = result.findNode.assignment('x[0]'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: IndexExpression target: SimpleIdentifier @@ -728,7 +738,8 @@ void f(Never x) { } '''); - assertResolvedNodeText(result.findNode.postfix('x++'), r''' + var node = result.findNode.postfix('x++'); + assertResolvedNodeText(node, r''' PostfixExpression operand: SimpleIdentifier token: x @@ -753,7 +764,8 @@ void f(Never? x) { } '''); - assertResolvedNodeText(result.findNode.postfix('x++'), r''' + var node = result.findNode.postfix('x++'); + assertResolvedNodeText(node, r''' PostfixExpression operand: SimpleIdentifier token: x @@ -779,7 +791,8 @@ void f(Never x) { } '''); - assertResolvedNodeText(result.findNode.prefix('++x'), r''' + var node = result.findNode.prefix('++x'); + assertResolvedNodeText(node, r''' PrefixExpression operator: ++ operand: SimpleIdentifier @@ -804,7 +817,8 @@ void f(Never? x) { } '''); - assertResolvedNodeText(result.findNode.prefix('++x'), r''' + var node = result.findNode.prefix('++x'); + assertResolvedNodeText(node, r''' PrefixExpression operator: ++ operand: SimpleIdentifier @@ -881,8 +895,8 @@ void f(Never x) { } '''); - var assignment = result.findNode.assignment('foo += 0'); - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('foo += 0'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: PrefixedIdentifier prefix: SimpleIdentifier @@ -945,8 +959,8 @@ void f(Never x) { } '''); - var assignment = result.findNode.assignment('foo = 0'); - assertResolvedNodeText(assignment, r''' + var node = result.findNode.assignment('foo = 0'); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: PrefixedIdentifier prefix: SimpleIdentifier diff --git a/pkg/analyzer/test/src/diagnostics/undefined_setter_test.dart b/pkg/analyzer/test/src/diagnostics/undefined_setter_test.dart index 4a1e51846cb..de035f73ff0 100644 --- a/pkg/analyzer/test/src/diagnostics/undefined_setter_test.dart +++ b/pkg/analyzer/test/src/diagnostics/undefined_setter_test.dart @@ -246,7 +246,8 @@ f(C c) { } '''); - assertResolvedNodeText(result.findNode.assignment('a ='), r''' + var node = result.findNode.assignment('a ='); + assertResolvedNodeText(node, r''' AssignmentExpression leftHandSide: PrefixedIdentifier prefix: SimpleIdentifier diff --git a/pkg/analyzer/test/src/diagnostics/use_of_nullable_value_test.dart b/pkg/analyzer/test/src/diagnostics/use_of_nullable_value_test.dart index 143130ea483..c702efabede 100644 --- a/pkg/analyzer/test/src/diagnostics/use_of_nullable_value_test.dart +++ b/pkg/analyzer/test/src/diagnostics/use_of_nullable_value_test.dart @@ -433,7 +433,8 @@ m(B b) { } '''); - assertResolvedNodeText(result.findNode.assignment('x = 1'), r''' + var node1 = result.findNode.assignment('x = 1'); + assertResolvedNodeText(node1, r''' AssignmentExpression leftHandSide: PropertyAccess target: PrefixedIdentifier @@ -467,7 +468,8 @@ AssignmentExpression staticType: int? '''); - assertResolvedNodeText(result.findNode.assignment('x = 2'), r''' + var node2 = result.findNode.assignment('x = 2'); + assertResolvedNodeText(node2, r''' AssignmentExpression leftHandSide: PropertyAccess target: PrefixedIdentifier @@ -510,7 +512,8 @@ m(int x, int? y) { } '''); - assertResolvedNodeText(result.findNode.assignment('x ='), r''' + var node1 = result.findNode.assignment('x ='); + assertResolvedNodeText(node1, r''' AssignmentExpression leftHandSide: SimpleIdentifier token: x @@ -529,7 +532,8 @@ AssignmentExpression staticType: int '''); - assertResolvedNodeText(result.findNode.assignment('y ='), r''' + var node2 = result.findNode.assignment('y ='); + assertResolvedNodeText(node2, r''' AssignmentExpression leftHandSide: SimpleIdentifier token: y @@ -570,7 +574,8 @@ m(B b) { } '''); - assertResolvedNodeText(result.findNode.assignment('x +='), r''' + var node1 = result.findNode.assignment('x +='); + assertResolvedNodeText(node1, r''' AssignmentExpression leftHandSide: PropertyAccess target: PrefixedIdentifier @@ -604,7 +609,8 @@ AssignmentExpression staticType: int '''); - assertResolvedNodeText(result.findNode.assignment('y +='), r''' + var node2 = result.findNode.assignment('y +='); + assertResolvedNodeText(node2, r''' AssignmentExpression leftHandSide: PropertyAccess target: PrefixedIdentifier @@ -659,7 +665,8 @@ m(B b) { } '''); - assertResolvedNodeText(result.findNode.assignment('x += 1'), r''' + var node1 = result.findNode.assignment('x += 1'); + assertResolvedNodeText(node1, r''' AssignmentExpression leftHandSide: PropertyAccess target: PrefixedIdentifier @@ -693,7 +700,8 @@ AssignmentExpression staticType: int? '''); - assertResolvedNodeText(result.findNode.assignment('x += 2'), r''' + var node2 = result.findNode.assignment('x += 2'); + assertResolvedNodeText(node2, r''' AssignmentExpression leftHandSide: PropertyAccess target: PrefixedIdentifier @@ -738,7 +746,8 @@ m(int x, int? y) { } '''); - assertResolvedNodeText(result.findNode.assignment('x +='), r''' + var node1 = result.findNode.assignment('x +='); + assertResolvedNodeText(node1, r''' AssignmentExpression leftHandSide: SimpleIdentifier token: x @@ -757,7 +766,8 @@ AssignmentExpression staticType: int '''); - assertResolvedNodeText(result.findNode.assignment('y +='), r''' + var node2 = result.findNode.assignment('y +='); + assertResolvedNodeText(node2, r''' AssignmentExpression leftHandSide: SimpleIdentifier token: y