Skip to content

Commit dc77d08

Browse files
scheglovCommit Queue
authored andcommitted
Elements. Migrate PrefixElementResolutionTest into LibraryFragmentElementTest.
Change-Id: Id894f7a51504de5dd9dd8bce62f0fddca4734267 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/406440 Reviewed-by: Phil Quitslund <[email protected]> Commit-Queue: Konstantin Shcheglov <[email protected]>
1 parent 23b4b3c commit dc77d08

File tree

10 files changed

+262
-288
lines changed

10 files changed

+262
-288
lines changed

pkg/analyzer/test/src/dart/resolution/assignment_test.dart

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1559,7 +1559,9 @@ AssignmentExpression
15591559
readElement2: <null>
15601560
readType: null
15611561
writeElement: <null>
1562-
writeElement2: <null>
1562+
writeElement2: multiplyDefinedElement
1563+
package:test/a.dart::@class::C
1564+
package:test/b.dart::@class::C
15631565
writeType: InvalidType
15641566
staticElement: <null>
15651567
element: <null>

pkg/analyzer/test/src/dart/resolution/method_invocation_test.dart

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1765,7 +1765,9 @@ MethodInvocation
17651765
methodName: SimpleIdentifier
17661766
token: foo
17671767
staticElement: <null>
1768-
element: <null>
1768+
element: multiplyDefinedElement
1769+
package:test/a.dart::@function::foo
1770+
package:test/b.dart::@function::foo
17691771
staticType: void Function(int)
17701772
argumentList: ArgumentList
17711773
leftParenthesis: (
@@ -1811,7 +1813,9 @@ MethodInvocation
18111813
methodName: SimpleIdentifier
18121814
token: foo
18131815
staticElement: <null>
1814-
element: <null>
1816+
element: multiplyDefinedElement
1817+
package:test/a.dart::@function::foo
1818+
package:test/b.dart::@function::foo
18151819
staticType: void Function(int)
18161820
argumentList: ArgumentList
18171821
leftParenthesis: (

pkg/analyzer/test/src/dart/resolution/named_type_test.dart

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -788,7 +788,9 @@ void f(A a) {}
788788
NamedType
789789
name: A
790790
element: <null>
791-
element2: <null>
791+
element2: multiplyDefinedElement
792+
package:test/a.dart::@class::A
793+
package:test/b.dart::@class::A
792794
type: InvalidType
793795
''');
794796
}

pkg/analyzer/test/src/dart/resolution/prefix_element_test.dart

Lines changed: 0 additions & 253 deletions
This file was deleted.

pkg/analyzer/test/src/dart/resolution/resolution.dart

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -447,10 +447,6 @@ mixin ResolutionTest implements ResourceProviderMixin {
447447
ExpectedContextMessage message(File file, int offset, int length) =>
448448
ExpectedContextMessage(file, offset, length);
449449

450-
Matcher multiplyDefinedElementMatcher(List<Element> elements) {
451-
return _MultiplyDefinedElementMatcher(elements);
452-
}
453-
454450
Future<ResolvedUnitResult> resolveFile(File file);
455451

456452
/// Resolve [file] into [result].
@@ -507,27 +503,6 @@ mixin ResolutionTest implements ResourceProviderMixin {
507503
}
508504
}
509505

510-
class _MultiplyDefinedElementMatcher extends Matcher {
511-
final Iterable<Element> elements;
512-
513-
_MultiplyDefinedElementMatcher(this.elements);
514-
515-
@override
516-
Description describe(Description description) {
517-
return description.add('elements: $elements\n');
518-
}
519-
520-
@override
521-
bool matches(element, Map matchState) {
522-
if (element is MultiplyDefinedElementImpl) {
523-
var actualSet = element.conflictingElements.toSet();
524-
actualSet.removeAll(elements);
525-
return actualSet.isEmpty;
526-
}
527-
return false;
528-
}
529-
}
530-
531506
extension ResolvedUnitResultExtension on ResolvedUnitResult {
532507
FindElement get findElement {
533508
return FindElement(unit);

pkg/analyzer/test/src/dart/resolution/test_all.dart

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@ import 'pattern_assignment_test.dart' as pattern_assignment;
8989
import 'pattern_variable_declaration_statement_test.dart'
9090
as pattern_variable_declaration_statement;
9191
import 'postfix_expression_test.dart' as postfix_expression;
92-
import 'prefix_element_test.dart' as prefix_element;
9392
import 'prefix_expression_test.dart' as prefix_expression;
9493
import 'prefixed_identifier_test.dart' as prefixed_identifier;
9594
import 'property_access_test.dart' as property_access;
@@ -197,7 +196,6 @@ main() {
197196
pattern_assignment.main();
198197
pattern_variable_declaration_statement.main();
199198
postfix_expression.main();
200-
prefix_element.main();
201199
prefix_expression.main();
202200
prefixed_identifier.main();
203201
property_access.main();

0 commit comments

Comments
 (0)