Skip to content

Commit fad65ac

Browse files
scheglovCommit Queue
authored andcommitted
Elements. Migrate NamespaceBuilder.
Change-Id: I3f51d6ad88528a7a7251a8c140795a442b04e5a9 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/411460 Reviewed-by: Brian Wilkerson <[email protected]> Commit-Queue: Konstantin Shcheglov <[email protected]>
1 parent 9c9fe8f commit fad65ac

File tree

13 files changed

+120
-146
lines changed

13 files changed

+120
-146
lines changed

pkg/analysis_server/lib/src/services/correction/namespace.dart

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,15 @@
44

55
import 'package:analyzer/dart/ast/ast.dart';
66
import 'package:analyzer/dart/element/element2.dart';
7+
import 'package:analyzer/src/dart/element/element.dart';
78
import 'package:analyzer/src/dart/resolver/scope.dart';
89

910
/// Returns the [Element2] exported from the given [LibraryElement2].
1011
Element2? getExportedElement(LibraryElement2? library, String name) {
1112
if (library == null) {
1213
return null;
1314
}
15+
library as LibraryElementImpl;
1416
var namespace = NamespaceBuilder().createExportNamespaceForLibrary(library);
1517
return namespace.definedNames2[name];
1618
}

pkg/analyzer/api.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5269,7 +5269,7 @@ package:analyzer/src/dart/resolver/scope.dart:
52695269
Namespace (class extends Object):
52705270
EMPTY (static getter: Namespace)
52715271
EMPTY= (static setter: Namespace)
5272-
new (constructor: Namespace Function(Map<String, Element>))
5272+
new (constructor: Namespace Function(Map<String, Element2>))
52735273
definedNames (getter: Map<String, Element>)
52745274
definedNames2 (getter: Map<String, Element2>)
52755275
get (method: Element? Function(String))

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5955,7 +5955,7 @@ final class ExportDirectiveImpl extends NamespaceDirectiveImpl
59555955

59565956
@experimental
59575957
@override
5958-
LibraryExport? get libraryExport => element as LibraryExport?;
5958+
LibraryExportElementImpl? get libraryExport => element;
59595959

59605960
@override
59615961
ChildEntities get _childEntities => super._childEntities
@@ -9973,7 +9973,7 @@ final class ImportDirectiveImpl extends NamespaceDirectiveImpl
99739973

99749974
@experimental
99759975
@override
9976-
LibraryImport? get libraryImport => element as LibraryImport?;
9976+
LibraryImportElementImpl? get libraryImport => element;
99779977

99789978
@override
99799979
SimpleIdentifierImpl? get prefix => _prefix;

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7697,7 +7697,7 @@ class LibraryExportElementImpl extends _ExistingElementImpl
76977697
}
76987698

76997699
@override
7700-
LibraryElement2? get exportedLibrary2 => exportedLibrary;
7700+
LibraryElementImpl? get exportedLibrary2 => exportedLibrary;
77017701

77027702
@override
77037703
String get identifier => 'export@$nameOffset';
@@ -7769,7 +7769,7 @@ class LibraryImportElementImpl extends _ExistingElementImpl
77697769
}
77707770

77717771
@override
7772-
LibraryElement2? get importedLibrary2 => importedLibrary;
7772+
LibraryElementImpl? get importedLibrary2 => importedLibrary;
77737773

77747774
@override
77757775
ElementKind get kind => ElementKind.IMPORT;
@@ -7783,12 +7783,12 @@ class LibraryImportElementImpl extends _ExistingElementImpl
77837783
@override
77847784
Namespace get namespace {
77857785
var uri = this.uri;
7786-
if (uri is DirectiveUriWithLibrary) {
7786+
if (uri is DirectiveUriWithLibraryImpl) {
77877787
return _namespace ??=
77887788
NamespaceBuilder().createImportNamespaceForDirective(
77897789
importedLibrary: uri.library,
77907790
combinators: combinators,
7791-
prefix: prefix?.element,
7791+
prefix: prefix2,
77927792
);
77937793
}
77947794
return Namespace.EMPTY;

0 commit comments

Comments
 (0)