|
2 | 2 | // for details. All rights reserved. Use of this source code is governed by a |
3 | 3 | // BSD-style license that can be found in the LICENSE file. |
4 | 4 |
|
5 | | -// ignore_for_file: analyzer_use_new_elements |
6 | | - |
7 | 5 | import 'package:analyzer/dart/analysis/declared_variables.dart'; |
8 | 6 | import 'package:analyzer/dart/ast/ast.dart'; |
9 | 7 | import 'package:analyzer/dart/constant/value.dart'; |
@@ -3515,14 +3513,14 @@ const v2 = -v1; |
3515 | 3513 |
|
3516 | 3514 | void _assertHasPrimitiveEqualityFalse(String name) { |
3517 | 3515 | var value = _evaluateConstant(name); |
3518 | | - var featureSet = result.libraryElement.featureSet; |
| 3516 | + var featureSet = result.libraryElement2.featureSet; |
3519 | 3517 | var has = value.hasPrimitiveEquality(featureSet); |
3520 | 3518 | expect(has, isFalse); |
3521 | 3519 | } |
3522 | 3520 |
|
3523 | 3521 | void _assertHasPrimitiveEqualityTrue(String name) { |
3524 | 3522 | var value = _evaluateConstant(name); |
3525 | | - var featureSet = result.libraryElement.featureSet; |
| 3523 | + var featureSet = result.libraryElement2.featureSet; |
3526 | 3524 | var has = value.hasPrimitiveEquality(featureSet); |
3527 | 3525 | expect(has, isTrue); |
3528 | 3526 | } |
@@ -4894,15 +4892,15 @@ class ConstantVisitorTestSupport extends PubPackageResolutionTest { |
4894 | 4892 | Map<String, DartObjectImpl>? lexicalEnvironment, |
4895 | 4893 | }) { |
4896 | 4894 | var unit = this.result.unit; |
4897 | | - var source = unit.declaredElement!.source; |
| 4895 | + var source = unit.declaredFragment!.source; |
4898 | 4896 | var errorListener = GatheringErrorListener(); |
4899 | 4897 | var errorReporter = ErrorReporter(errorListener, source); |
4900 | 4898 | var constantVisitor = ConstantVisitor( |
4901 | 4899 | ConstantEvaluationEngine( |
4902 | 4900 | declaredVariables: DeclaredVariables.fromMap(declaredVariables), |
4903 | 4901 | configuration: ConstantEvaluationConfiguration(), |
4904 | 4902 | ), |
4905 | | - this.result.libraryElement as LibraryElementImpl, |
| 4903 | + this.result.libraryElement2 as LibraryElementImpl, |
4906 | 4904 | errorReporter, |
4907 | 4905 | lexicalEnvironment: lexicalEnvironment, |
4908 | 4906 | ); |
@@ -4932,18 +4930,21 @@ class ConstantVisitorTestSupport extends PubPackageResolutionTest { |
4932 | 4930 | } |
4933 | 4931 |
|
4934 | 4932 | 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); |
4937 | 4936 | } |
4938 | 4937 |
|
4939 | 4938 | 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); |
4942 | 4942 | } |
4943 | 4943 |
|
4944 | 4944 | 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); |
4947 | 4948 | } |
4948 | 4949 | } |
4949 | 4950 |
|
|
0 commit comments