Skip to content

Commit 0e1b8f7

Browse files
scheglovCommit Queue
authored andcommitted
Elements. Migrate LibraryAnalyzer.
Change-Id: Ia383ddfc11798365dd3c0ca456161e04c355c46d Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/410240 Commit-Queue: Konstantin Shcheglov <[email protected]> Reviewed-by: Phil Quitslund <[email protected]>
1 parent c714269 commit 0e1b8f7

File tree

5 files changed

+12
-13
lines changed

5 files changed

+12
-13
lines changed

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

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,8 @@
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/analysis/features.dart';
9-
import 'package:analyzer/dart/element/element.dart';
107
import 'package:analyzer/error/error.dart';
118
import 'package:analyzer/error/listener.dart';
129
import 'package:analyzer/source/file_source.dart';
@@ -254,15 +251,15 @@ class LibraryAnalyzer {
254251
var libraryUnit = libraryUnitAnalysis.unit;
255252
var libraryOverrideToken = libraryUnit.languageVersionToken;
256253

257-
var elementToUnit = <CompilationUnitElement, CompilationUnit>{};
254+
var elementToUnit = <CompilationUnitElementImpl, CompilationUnit>{};
258255
for (var fileAnalysis in _libraryFiles.values) {
259256
elementToUnit[fileAnalysis.element] = fileAnalysis.unit;
260257
}
261258

262259
for (var directive in libraryUnit.directives) {
263260
if (directive is PartDirectiveImpl) {
264261
var elementUri = directive.element?.uri;
265-
if (elementUri is DirectiveUriWithUnit) {
262+
if (elementUri is DirectiveUriWithUnitImpl) {
266263
var partUnit = elementToUnit[elementUri.unit];
267264
if (partUnit != null) {
268265
var shouldReport = false;
@@ -390,7 +387,7 @@ class LibraryAnalyzer {
390387
errorReporter: fileAnalysis.errorReporter,
391388
);
392389
analysesToContextUnits[fileAnalysis] = linterContextUnit;
393-
if (fileAnalysis.unit.declaredElement == definingUnit) {
390+
if (fileAnalysis.unit.declaredFragment == definingUnit) {
394391
definingContextUnit = linterContextUnit;
395392
workspacePackage = fileAnalysis.file.workspacePackage;
396393
}
@@ -472,7 +469,7 @@ class LibraryAnalyzer {
472469
ErrorVerifier errorVerifier = ErrorVerifier(
473470
errorReporter,
474471
_libraryElement,
475-
unit.declaredElement!,
472+
unit.declaredFragment!,
476473
_typeProvider,
477474
_inheritance,
478475
_libraryVerificationContext,

pkg/analyzer/lib/src/dart/ast/ast.dart

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3526,7 +3526,9 @@ final class CompilationUnitImpl extends AstNodeImpl
35263526

35273527
@experimental
35283528
@override
3529-
LibraryFragment? get declaredFragment => declaredElement as LibraryFragment?;
3529+
CompilationUnitElementImpl? get declaredFragment {
3530+
return declaredElement;
3531+
}
35303532

35313533
@override
35323534
NodeListImpl<DirectiveImpl> get directives => _directives;

pkg/analyzer/lib/src/dart/element/element.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1278,8 +1278,8 @@ class CompilationUnitElementImpl extends UriReferencedElementImpl
12781278
if (prefix == null && name.startsWith(r'_$')) {
12791279
for (var partElement in parts) {
12801280
var uri = partElement.uri;
1281-
if (uri is DirectiveUriWithSource &&
1282-
uri is! DirectiveUriWithUnit &&
1281+
if (uri is DirectiveUriWithSourceImpl &&
1282+
uri is! DirectiveUriWithUnitImpl &&
12831283
file_paths.isGenerated(uri.relativeUriString)) {
12841284
return true;
12851285
}
@@ -9712,7 +9712,7 @@ mixin ParameterElementMixin
97129712
class PartElementImpl extends _ExistingElementImpl
97139713
implements PartElement, PartInclude {
97149714
@override
9715-
final DirectiveUri uri;
9715+
final DirectiveUriImpl uri;
97169716

97179717
PartElementImpl({
97189718
required this.uri,

pkg/analyzer/lib/src/summary2/bundle_reader.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -833,7 +833,7 @@ class LibraryReader {
833833
});
834834
}
835835

836-
DirectiveUri _readDirectiveUri({
836+
DirectiveUriImpl _readDirectiveUri({
837837
required CompilationUnitElementImpl containerUnit,
838838
}) {
839839
DirectiveUriWithRelativeUriStringImpl readWithRelativeUriString() {

pkg/analyzer/lib/src/summary2/library_builder.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -673,7 +673,7 @@ class LibraryBuilder {
673673
required CompilationUnitElementImpl containerUnit,
674674
required file_state.PartIncludeState state,
675675
}) {
676-
DirectiveUri directiveUri;
676+
DirectiveUriImpl directiveUri;
677677
switch (state) {
678678
case PartIncludeWithFile():
679679
var includedPart = state.includedPart;

0 commit comments

Comments
 (0)