Replace more uses of deprecated elements
Change-Id: Ied014ca1d8cbf5917b5e3d15d0892e2e02257ccf
Reviewed-on: https://dart-review.googlesource.com/c/88423
Reviewed-by: Konstantin Shcheglov <scheglov@google.com>
Commit-Queue: Brian Wilkerson <brianwilkerson@google.com>
diff --git a/pkg/analyzer/lib/src/dart/ast/utilities.dart b/pkg/analyzer/lib/src/dart/ast/utilities.dart
index 7acc163..051fa2b 100644
--- a/pkg/analyzer/lib/src/dart/ast/utilities.dart
+++ b/pkg/analyzer/lib/src/dart/ast/utilities.dart
@@ -3075,14 +3075,14 @@
@override
CompilationUnit visitCompilationUnit(CompilationUnit node) {
- CompilationUnit copy = astFactory.compilationUnit(
+ CompilationUnitImpl copy = astFactory.compilationUnit(
_mapToken(node.beginToken),
_cloneNode(node.scriptTag),
_cloneNodeList(node.directives),
_cloneNodeList(node.declarations),
_mapToken(node.endToken));
copy.lineInfo = node.lineInfo;
- copy.element = node.element;
+ copy.declaredElement = node.declaredElement;
return copy;
}
@@ -3112,7 +3112,7 @@
@override
ConstructorDeclaration visitConstructorDeclaration(
ConstructorDeclaration node) {
- ConstructorDeclaration copy = astFactory.constructorDeclaration(
+ ConstructorDeclarationImpl copy = astFactory.constructorDeclaration(
_cloneNode(node.documentationComment),
_cloneNodeList(node.metadata),
_mapToken(node.externalKeyword),
@@ -3126,7 +3126,7 @@
_cloneNodeList(node.initializers),
_cloneNode(node.redirectedConstructor),
_cloneNode(node.body));
- copy.element = node.element;
+ copy.declaredElement = node.declaredElement;
return copy;
}
@@ -3337,11 +3337,11 @@
@override
FunctionExpression visitFunctionExpression(FunctionExpression node) {
- FunctionExpression copy = astFactory.functionExpression(
+ FunctionExpressionImpl copy = astFactory.functionExpression(
_cloneNode(node.typeParameters),
_cloneNode(node.parameters),
_cloneNode(node.body));
- copy.element = node.element;
+ copy.declaredElement = node.declaredElement;
copy.staticType = node.staticType;
return copy;
}
@@ -5749,7 +5749,7 @@
@override
bool visitConstructorDeclaration(ConstructorDeclaration node) {
- ConstructorDeclaration toNode = this._toNode as ConstructorDeclaration;
+ ConstructorDeclarationImpl toNode = this._toNode as ConstructorDeclaration;
if (_and(
_isEqualNodes(node.documentationComment, toNode.documentationComment),
_isEqualNodeLists(node.metadata, toNode.metadata),
@@ -5764,7 +5764,7 @@
_isEqualNodeLists(node.initializers, toNode.initializers),
_isEqualNodes(node.redirectedConstructor, toNode.redirectedConstructor),
_isEqualNodes(node.body, toNode.body))) {
- toNode.element = node.declaredElement;
+ toNode.declaredElement = node.declaredElement;
return true;
}
return false;
@@ -6020,10 +6020,10 @@
@override
bool visitFunctionExpression(FunctionExpression node) {
- FunctionExpression toNode = this._toNode as FunctionExpression;
+ FunctionExpressionImpl toNode = this._toNode as FunctionExpression;
if (_and(_isEqualNodes(node.parameters, toNode.parameters),
_isEqualNodes(node.body, toNode.body))) {
- toNode.element = node.declaredElement;
+ toNode.declaredElement = node.declaredElement;
toNode.staticType = node.staticType;
return true;
}
diff --git a/pkg/analyzer/lib/src/dart/constant/utilities.dart b/pkg/analyzer/lib/src/dart/constant/utilities.dart
index b0aa23a..233ea04 100644
--- a/pkg/analyzer/lib/src/dart/constant/utilities.dart
+++ b/pkg/analyzer/lib/src/dart/constant/utilities.dart
@@ -9,6 +9,7 @@
import 'package:analyzer/dart/ast/token.dart';
import 'package:analyzer/dart/ast/visitor.dart';
import 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/src/dart/ast/ast.dart';
import 'package:analyzer/src/dart/ast/token.dart';
import 'package:analyzer/src/dart/ast/utilities.dart';
import 'package:analyzer/src/dart/element/element.dart';
@@ -55,8 +56,8 @@
@override
FunctionExpression visitFunctionExpression(FunctionExpression node) {
- FunctionExpression expression = super.visitFunctionExpression(node);
- expression.element = node.declaredElement;
+ FunctionExpressionImpl expression = super.visitFunctionExpression(node);
+ expression.declaredElement = node.declaredElement;
return expression;
}
diff --git a/pkg/analyzer/lib/src/dart/element/builder.dart b/pkg/analyzer/lib/src/dart/element/builder.dart
index cefb1d8..5d439ae 100644
--- a/pkg/analyzer/lib/src/dart/element/builder.dart
+++ b/pkg/analyzer/lib/src/dart/element/builder.dart
@@ -144,7 +144,7 @@
element.generator = true;
}
_currentHolder.addConstructor(element);
- node.element = element;
+ (node as ConstructorDeclarationImpl).declaredElement = element;
if (constructorName == null) {
Identifier returnType = node.returnType;
if (returnType != null) {
@@ -208,7 +208,7 @@
@override
void visitFunctionDeclaration(FunctionDeclaration node) {
- FunctionExpression expression = node.functionExpression;
+ FunctionExpressionImpl expression = node.functionExpression;
if (expression != null) {
ElementHolder holder = new ElementHolder();
_visitChildren(holder, node);
@@ -239,7 +239,7 @@
element.hasImplicitReturnType = true;
}
_currentHolder.addFunction(element);
- expression.element = element;
+ expression.declaredElement = element;
functionName.staticElement = element;
} else {
SimpleIdentifier propertyNameNode = node.name;
@@ -282,7 +282,7 @@
getter.hasImplicitReturnType = true;
}
_currentHolder.addAccessor(getter);
- expression.element = getter;
+ expression.declaredElement = getter;
propertyNameNode.staticElement = getter;
} else {
PropertyAccessorElementImpl setter =
@@ -312,7 +312,7 @@
variable.setter = setter;
variable.isFinal = false;
_currentHolder.addAccessor(setter);
- expression.element = setter;
+ expression.declaredElement = setter;
propertyNameNode.staticElement = setter;
}
}
@@ -348,7 +348,7 @@
element.type = new FunctionTypeImpl(element);
element.hasImplicitReturnType = true;
_currentHolder.addFunction(element);
- node.element = element;
+ (node as FunctionExpressionImpl).declaredElement = element;
holder.validate();
}
@@ -1203,7 +1203,7 @@
@override
void visitFunctionDeclaration(FunctionDeclaration node) {
- FunctionExpression expression = node.functionExpression;
+ FunctionExpressionImpl expression = node.functionExpression;
if (expression == null) {
return;
}
@@ -1245,7 +1245,7 @@
}
_currentHolder.addFunction(element);
- expression.element = element;
+ expression.declaredElement = element;
node.name.staticElement = element;
holder.validate();
}
@@ -1284,7 +1284,7 @@
element.type = new FunctionTypeImpl(element);
element.hasImplicitReturnType = true;
_currentHolder.addFunction(element);
- node.element = element;
+ (node as FunctionExpressionImpl).declaredElement = element;
holder.validate();
}
diff --git a/pkg/analyzer/lib/src/generated/declaration_resolver.dart b/pkg/analyzer/lib/src/generated/declaration_resolver.dart
index 0f0d19b..7175395 100644
--- a/pkg/analyzer/lib/src/generated/declaration_resolver.dart
+++ b/pkg/analyzer/lib/src/generated/declaration_resolver.dart
@@ -103,7 +103,7 @@
ConstructorElement element = _match(node.name, _walker.getConstructor(),
offset: node.name?.offset ?? node.returnType.offset);
_walk(new ElementWalker.forExecutable(element, _enclosingUnit), () {
- node.element = element;
+ (node as ConstructorDeclarationImpl).declaredElement = element;
super.visitConstructorDeclaration(node);
});
resolveMetadata(node, node.metadata, element);
@@ -232,7 +232,8 @@
}
}
_setGenericFunctionType(node.returnType, element.returnType);
- node.functionExpression.element = element;
+ (node.functionExpression as FunctionExpressionImpl).declaredElement =
+ element;
_walker._elementHolder?.addFunction(element);
_walk(new ElementWalker.forExecutable(element, _enclosingUnit), () {
super.visitFunctionDeclaration(node);
diff --git a/pkg/analyzer/lib/src/generated/engine.dart b/pkg/analyzer/lib/src/generated/engine.dart
index f4d63dc..b56a2ca 100644
--- a/pkg/analyzer/lib/src/generated/engine.dart
+++ b/pkg/analyzer/lib/src/generated/engine.dart
@@ -17,6 +17,7 @@
import 'package:analyzer/src/context/builder.dart' show EmbedderYamlLocator;
import 'package:analyzer/src/context/cache.dart';
import 'package:analyzer/src/context/context.dart';
+import 'package:analyzer/src/dart/ast/ast.dart';
import 'package:analyzer/src/generated/constant.dart';
import 'package:analyzer/src/generated/java_engine.dart';
import 'package:analyzer/src/generated/resolver.dart';
@@ -2751,7 +2752,7 @@
@override
void visitConstructorDeclaration(ConstructorDeclaration node) {
if (eraseDeclarations) {
- node.element = null;
+ (node as ConstructorDeclarationImpl).declaredElement = null;
}
super.visitConstructorDeclaration(node);
}
@@ -2785,7 +2786,7 @@
@override
void visitFunctionExpression(FunctionExpression node) {
if (eraseDeclarations) {
- node.element = null;
+ (node as FunctionExpressionImpl).declaredElement = null;
}
super.visitFunctionExpression(node);
}
diff --git a/pkg/analyzer/lib/src/summary/expr_builder.dart b/pkg/analyzer/lib/src/summary/expr_builder.dart
index 59af2b3..e6af09e 100644
--- a/pkg/analyzer/lib/src/summary/expr_builder.dart
+++ b/pkg/analyzer/lib/src/summary/expr_builder.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors. Please see the AUTHORS file
+// Copyright (c) 2018, the Dart project authors. Please see the AUTHORS file
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
@@ -766,9 +766,9 @@
functionBody = astFactory.expressionFunctionBody(asyncKeyword,
TokenFactory.tokenFromType(TokenType.FUNCTION), bodyExpr, null);
}
- var functionExpression = astFactory.functionExpression(
+ FunctionExpressionImpl functionExpression = astFactory.functionExpression(
null, AstTestFactory.formalParameterList(parameters), functionBody);
- functionExpression.element = functionElement;
+ functionExpression.declaredElement = functionElement;
_push(functionExpression);
}
diff --git a/pkg/analyzer/test/generated/static_type_analyzer_test.dart b/pkg/analyzer/test/generated/static_type_analyzer_test.dart
index e0c2bc9..eae9fe1 100644
--- a/pkg/analyzer/test/generated/static_type_analyzer_test.dart
+++ b/pkg/analyzer/test/generated/static_type_analyzer_test.dart
@@ -1586,7 +1586,7 @@
FunctionElementImpl element = new FunctionElementImpl.forNode(null);
element.parameters = parameterElements;
element.type = new FunctionTypeImpl(element);
- node.element = element;
+ (node as FunctionExpressionImpl).declaredElement = element;
return node;
}
diff --git a/pkg/analyzer/test/src/dart/ast/utilities_test.dart b/pkg/analyzer/test/src/dart/ast/utilities_test.dart
index ad836a6..f19f1bd 100644
--- a/pkg/analyzer/test/src/dart/ast/utilities_test.dart
+++ b/pkg/analyzer/test/src/dart/ast/utilities_test.dart
@@ -570,14 +570,14 @@
void test_visitConstructorDeclaration() {
String className = "A";
String constructorName = "c";
- ConstructorDeclaration fromNode = AstTestFactory.constructorDeclaration(
+ ConstructorDeclarationImpl fromNode = AstTestFactory.constructorDeclaration(
AstTestFactory.identifier3(className),
constructorName,
AstTestFactory.formalParameterList(),
null);
ConstructorElement element = ElementFactory.constructorElement2(
ElementFactory.classElement2(className), constructorName);
- fromNode.element = element;
+ fromNode.declaredElement = element;
ConstructorDeclaration toNode = AstTestFactory.constructorDeclaration(
AstTestFactory.identifier3(className),
constructorName,
@@ -618,12 +618,12 @@
}
void test_visitFunctionExpression() {
- FunctionExpression fromNode = AstTestFactory.functionExpression2(
+ FunctionExpressionImpl fromNode = AstTestFactory.functionExpression2(
AstTestFactory.formalParameterList(),
AstTestFactory.emptyFunctionBody());
MethodElement element = ElementFactory.methodElement(
"m", ElementFactory.classElement2("C").type);
- fromNode.element = element;
+ fromNode.declaredElement = element;
DartType staticType = ElementFactory.classElement2("C").type;
fromNode.staticType = staticType;
FunctionExpression toNode = AstTestFactory.functionExpression2(
diff --git a/pkg/analyzer/test/src/dart/constant/utilities_test.dart b/pkg/analyzer/test/src/dart/constant/utilities_test.dart
index 05e7d25..0fa3898 100644
--- a/pkg/analyzer/test/src/dart/constant/utilities_test.dart
+++ b/pkg/analyzer/test/src/dart/constant/utilities_test.dart
@@ -6,6 +6,7 @@
import 'package:analyzer/dart/ast/standard_ast_factory.dart';
import 'package:analyzer/dart/ast/token.dart';
import 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/src/dart/ast/ast.dart';
import 'package:analyzer/src/dart/ast/token.dart';
import 'package:analyzer/src/dart/element/element.dart';
import 'package:analyzer/src/generated/constant.dart';
@@ -191,7 +192,7 @@
ConstructorElement _setupConstructorDeclaration(String name, bool isConst) {
Keyword constKeyword = isConst ? Keyword.CONST : null;
- ConstructorDeclaration constructorDeclaration =
+ ConstructorDeclarationImpl constructorDeclaration =
AstTestFactory.constructorDeclaration2(
constKeyword,
null,
@@ -203,7 +204,7 @@
ClassElement classElement = ElementFactory.classElement2(name);
ConstructorElement element =
ElementFactory.constructorElement(classElement, name, isConst);
- constructorDeclaration.element = element;
+ constructorDeclaration.declaredElement = element;
_node = constructorDeclaration;
return element;
}
@@ -234,7 +235,7 @@
classElement.fields = <FieldElement>[fieldElement];
classDeclaration.name.staticElement = classElement;
if (hasConstConstructor) {
- ConstructorDeclaration constructorDeclaration =
+ ConstructorDeclarationImpl constructorDeclaration =
AstTestFactory.constructorDeclaration2(
Keyword.CONST,
null,
@@ -246,7 +247,7 @@
classDeclaration.members.add(constructorDeclaration);
ConstructorElement constructorElement =
ElementFactory.constructorElement(classElement, '', true);
- constructorDeclaration.element = constructorElement;
+ constructorDeclaration.declaredElement = constructorElement;
classElement.constructors = <ConstructorElement>[constructorElement];
} else {
classElement.constructors = const <ConstructorElement>[];
