Skip to content

Commit 7c3e294

Browse files
scheglovCommit Queue
authored and
Commit Queue
committed
Elements. Migrate BuildSdkSummaryTest.
Adds `LibraryElement2.getClass2()` Change-Id: Idb6168ba320e54b26625a9847658908e81be2229 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/396622 Reviewed-by: Brian Wilkerson <[email protected]> Commit-Queue: Konstantin Shcheglov <[email protected]>
1 parent af9cc50 commit 7c3e294

File tree

4 files changed

+24
-12
lines changed

4 files changed

+24
-12
lines changed

pkg/analyzer/analyzer_use_new_elements.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,6 @@ lib/src/utilities/extensions/ast.dart
166166
lib/src/utilities/extensions/element.dart
167167
lib/src/utilities/extensions/flutter.dart
168168
lib/src/utilities/extensions/library_element.dart
169-
test/dart/sdk/build_sdk_summary_test.dart
170169
test/error/error_reporter_test.dart
171170
test/generated/element_resolver_test.dart
172171
test/generated/elements_types_mixin.dart

pkg/analyzer/lib/dart/element/element2.dart

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1525,6 +1525,9 @@ abstract class LibraryElement2 implements Element2, Annotatable {
15251525
///
15261526
/// This is the same URI as `firstFragment.source.uri` returns.
15271527
Uri get uri;
1528+
1529+
/// Returns the class defined in this library that has the given [name].
1530+
ClassElement2? getClass2(String name);
15281531
}
15291532

15301533
/// An `export` directive within a library fragment.

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6836,6 +6836,16 @@ class LibraryElementImpl extends ElementImpl
68366836
return null;
68376837
}
68386838

6839+
@override
6840+
ClassElement2? getClass2(String name) {
6841+
for (var class_ in classes) {
6842+
if (class_.name3 == name) {
6843+
return class_;
6844+
}
6845+
}
6846+
return null;
6847+
}
6848+
68396849
EnumElement? getEnum(String name) {
68406850
for (var unitElement in units) {
68416851
var element = unitElement.getEnum(name);

pkg/analyzer/test/dart/sdk/build_sdk_summary_test.dart

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
import 'package:analyzer/dart/analysis/results.dart';
66
import 'package:analyzer/dart/analysis/session.dart';
7-
import 'package:analyzer/dart/element/element.dart';
7+
import 'package:analyzer/dart/element/element2.dart';
88
import 'package:analyzer/dart/sdk/build_sdk_summary.dart';
99
import 'package:analyzer/file_system/file_system.dart';
1010
import 'package:analyzer/src/dart/analysis/analysis_context_collection.dart';
@@ -87,11 +87,11 @@ embedded_libs:
8787
var dartCore = await analysisSession.getLibrary('dart:core');
8888
var dartMath = await analysisSession.getLibrary('dart:math');
8989
var dartUi = await analysisSession.getLibrary('dart:ui');
90-
expect(dartAsync.getClass('Stream'), isNotNull);
91-
expect(dartCore.getClass('String'), isNotNull);
92-
expect(dartMath.getClass('Random'), isNotNull);
93-
expect(dartUi.getClass('FontStyle'), isNotNull);
94-
expect(dartUi.getClass('Offset'), isNotNull);
90+
expect(dartAsync.getClass2('Stream'), isNotNull);
91+
expect(dartCore.getClass2('String'), isNotNull);
92+
expect(dartMath.getClass2('Random'), isNotNull);
93+
expect(dartUi.getClass2('FontStyle'), isNotNull);
94+
expect(dartUi.getClass2('Offset'), isNotNull);
9595
}
9696

9797
test_it() async {
@@ -133,16 +133,16 @@ embedded_libs:
133133
var dartAsync = await analysisSession.getLibrary('dart:async');
134134
var dartCore = await analysisSession.getLibrary('dart:core');
135135
var dartMath = await analysisSession.getLibrary('dart:math');
136-
expect(dartAsync.getClass('Stream'), isNotNull);
137-
expect(dartCore.getClass('String'), isNotNull);
138-
expect(dartMath.getClass('Random'), isNotNull);
136+
expect(dartAsync.getClass2('Stream'), isNotNull);
137+
expect(dartCore.getClass2('String'), isNotNull);
138+
expect(dartMath.getClass2('Random'), isNotNull);
139139
}
140140
}
141141

142142
extension on AnalysisSession {
143-
Future<LibraryElement> getLibrary(String uriStr) async {
143+
Future<LibraryElement2> getLibrary(String uriStr) async {
144144
var libraryResult = await getLibraryByUri(uriStr);
145145
libraryResult as LibraryElementResult;
146-
return libraryResult.element;
146+
return libraryResult.element2;
147147
}
148148
}

0 commit comments

Comments
 (0)