Skip to content

Commit 5bf9bdb

Browse files
scheglovCommit Queue
authored andcommitted
Elements. Deprecate V1 getters in src/dart/ast/ast.dart
Change-Id: I072b119e2e5b49eb0a286bd805d8280448ca9782 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/413160 Reviewed-by: Brian Wilkerson <[email protected]> Commit-Queue: Konstantin Shcheglov <[email protected]> Reviewed-by: Paul Berry <[email protected]>
1 parent 237742f commit 5bf9bdb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+1266
-1679
lines changed

pkg/analyzer/api.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -519,7 +519,7 @@ package:analyzer/dart/ast/ast.dart:
519519
arguments (getter: ArgumentList)
520520
augmentedKeyword (getter: Token)
521521
element (getter: ExecutableElement?)
522-
element2 (getter: ExecutableElement2?)
522+
fragment (getter: ExecutableFragment?)
523523
typeArguments (getter: TypeArgumentList?)
524524
AwaitExpression (class extends Object implements Expression):
525525
awaitKeyword (getter: Token)
@@ -567,6 +567,7 @@ package:analyzer/dart/ast/ast.dart:
567567
CatchClauseParameter (class extends AstNode):
568568
declaredElement (getter: LocalVariableElement?)
569569
declaredElement2 (getter: LocalVariableElement2?)
570+
declaredFragment (getter: LocalVariableFragment?)
570571
name (getter: Token)
571572
ClassDeclaration (class extends Object implements NamedCompilationUnitMember):
572573
abstractKeyword (getter: Token?)
@@ -1249,14 +1250,15 @@ package:analyzer/dart/ast/ast.dart:
12491250
declaration (getter: PatternVariableDeclaration)
12501251
semicolon (getter: Token)
12511252
PostfixExpression (class extends Object implements Expression, NullShortableExpression, MethodReferenceExpression, CompoundAssignmentExpression):
1253+
element (getter: MethodElement2?)
12521254
operand (getter: Expression)
12531255
operator (getter: Token)
12541256
staticElement (getter: MethodElement?)
12551257
PrefixExpression (class extends Object implements Expression, NullShortableExpression, MethodReferenceExpression, CompoundAssignmentExpression):
1258+
element (getter: MethodElement2?)
12561259
operand (getter: Expression)
12571260
operator (getter: Token)
12581261
staticElement (getter: MethodElement?)
1259-
staticElement= (setter: MethodElement?)
12601262
PrefixedIdentifier (class extends Object implements Identifier):
12611263
identifier (getter: SimpleIdentifier)
12621264
isDeferred (getter: bool)
@@ -1299,7 +1301,6 @@ package:analyzer/dart/ast/ast.dart:
12991301
argumentList (getter: ArgumentList)
13001302
constructorName (getter: SimpleIdentifier?)
13011303
period (getter: Token?)
1302-
staticElement (getter: ConstructorElement?)
13031304
thisKeyword (getter: Token)
13041305
RelationalPattern (class extends Object implements DartPattern):
13051306
element (getter: MethodElement?)

pkg/analyzer/lib/src/dart/analysis/library_analyzer.dart

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ import 'package:analyzer/src/lint/analysis_rule_timers.dart';
5050
import 'package:analyzer/src/lint/linter.dart';
5151
import 'package:analyzer/src/lint/linter_visitor.dart';
5252
import 'package:analyzer/src/util/performance/operation_performance.dart';
53+
import 'package:analyzer/src/utilities/extensions/element.dart';
5354
import 'package:analyzer/src/utilities/extensions/version.dart';
5455
import 'package:analyzer/src/workspace/pub.dart';
5556
import 'package:analyzer/src/workspace/workspace.dart';
@@ -258,9 +259,9 @@ class LibraryAnalyzer {
258259

259260
for (var directive in libraryUnit.directives) {
260261
if (directive is PartDirectiveImpl) {
261-
var elementUri = directive.element?.uri;
262-
if (elementUri is DirectiveUriWithUnitImpl) {
263-
var partUnit = elementToUnit[elementUri.unit];
262+
var uri = directive.partInclude?.uri;
263+
if (uri is DirectiveUriWithUnitImpl) {
264+
var partUnit = elementToUnit[uri.unit];
264265
if (partUnit != null) {
265266
var shouldReport = false;
266267
var partOverrideToken = partUnit.languageVersionToken;
@@ -652,7 +653,7 @@ class LibraryAnalyzer {
652653
errorListener: errorListener,
653654
performance: OperationPerformanceImpl('<root>'),
654655
);
655-
unit.declaredElement = unitElement;
656+
unit.declaredFragment = unitElement;
656657

657658
// TODO(scheglov): Store [IgnoreInfo] as unlinked data.
658659

@@ -965,7 +966,7 @@ class LibraryAnalyzer {
965966
required ErrorReporter errorReporter,
966967
}) {
967968
directive.element = element;
968-
directive.prefix?.staticElement = element.prefix?.element;
969+
directive.prefix?.element = element.prefix?.element.asElement2;
969970
_resolveUriConfigurations(
970971
configurationNodes: directive.configurations,
971972
configurationUris: state.uris.configurations,

0 commit comments

Comments
 (0)