Skip to content

Commit 13b3ee3

Browse files
scheglovCommit Queue
authored andcommitted
Elements. Migrate ConstantVisitorTest.
Change-Id: I629d05cbbd19c6cfb44bcc65741ae6853c990691 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/406400 Commit-Queue: Konstantin Shcheglov <[email protected]> Reviewed-by: Phil Quitslund <[email protected]>
1 parent f5e6ff5 commit 13b3ee3

File tree

2 files changed

+14
-19
lines changed

2 files changed

+14
-19
lines changed

pkg/analyzer/test/src/dart/constant/evaluation_test.dart

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
// for details. All rights reserved. Use of this source code is governed by a
33
// BSD-style license that can be found in the LICENSE file.
44

5-
// ignore_for_file: analyzer_use_new_elements
6-
75
import 'package:analyzer/dart/analysis/declared_variables.dart';
86
import 'package:analyzer/dart/ast/ast.dart';
97
import 'package:analyzer/dart/constant/value.dart';
@@ -3515,14 +3513,14 @@ const v2 = -v1;
35153513

35163514
void _assertHasPrimitiveEqualityFalse(String name) {
35173515
var value = _evaluateConstant(name);
3518-
var featureSet = result.libraryElement.featureSet;
3516+
var featureSet = result.libraryElement2.featureSet;
35193517
var has = value.hasPrimitiveEquality(featureSet);
35203518
expect(has, isFalse);
35213519
}
35223520

35233521
void _assertHasPrimitiveEqualityTrue(String name) {
35243522
var value = _evaluateConstant(name);
3525-
var featureSet = result.libraryElement.featureSet;
3523+
var featureSet = result.libraryElement2.featureSet;
35263524
var has = value.hasPrimitiveEquality(featureSet);
35273525
expect(has, isTrue);
35283526
}
@@ -4894,15 +4892,15 @@ class ConstantVisitorTestSupport extends PubPackageResolutionTest {
48944892
Map<String, DartObjectImpl>? lexicalEnvironment,
48954893
}) {
48964894
var unit = this.result.unit;
4897-
var source = unit.declaredElement!.source;
4895+
var source = unit.declaredFragment!.source;
48984896
var errorListener = GatheringErrorListener();
48994897
var errorReporter = ErrorReporter(errorListener, source);
49004898
var constantVisitor = ConstantVisitor(
49014899
ConstantEvaluationEngine(
49024900
declaredVariables: DeclaredVariables.fromMap(declaredVariables),
49034901
configuration: ConstantEvaluationConfiguration(),
49044902
),
4905-
this.result.libraryElement as LibraryElementImpl,
4903+
this.result.libraryElement2 as LibraryElementImpl,
49064904
errorReporter,
49074905
lexicalEnvironment: lexicalEnvironment,
49084906
);
@@ -4932,18 +4930,21 @@ class ConstantVisitorTestSupport extends PubPackageResolutionTest {
49324930
}
49334931

49344932
DartObjectImpl? _field(String variableName) {
4935-
var element = findElement.field(variableName) as ConstVariableElement;
4936-
return _evaluationResult(element);
4933+
var element = findElement2.field(variableName);
4934+
var constFragment = element.firstFragment as ConstVariableElement;
4935+
return _evaluationResult(constFragment);
49374936
}
49384937

49394938
DartObjectImpl? _localVar(String variableName) {
4940-
var element = findElement.localVar(variableName) as ConstVariableElement;
4941-
return _evaluationResult(element);
4939+
var element = findElement2.localVar(variableName);
4940+
var constFragment = element.firstFragment as ConstVariableElement;
4941+
return _evaluationResult(constFragment);
49424942
}
49434943

49444944
DartObjectImpl? _topLevelVar(String variableName) {
4945-
var element = findElement.topVar(variableName) as ConstVariableElement;
4946-
return _evaluationResult(element);
4945+
var element = findElement2.topVar(variableName);
4946+
var constFragment = element.firstFragment as ConstVariableElement;
4947+
return _evaluationResult(constFragment);
49474948
}
49484949
}
49494950

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

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -107,13 +107,7 @@ mixin ResolutionTest implements ResourceProviderMixin {
107107
newFile(testFile.path, content);
108108
}
109109

110-
void assertDartObjectText(
111-
DartObject? object,
112-
String expected, {
113-
LibraryElement? libraryElement,
114-
}) {
115-
libraryElement ??= result.libraryElement;
116-
110+
void assertDartObjectText(DartObject? object, String expected) {
117111
var buffer = StringBuffer();
118112
var sink = TreeStringSink(
119113
sink: buffer,

0 commit comments

Comments
 (0)