Skip to content

Commit c6f3dd4

Browse files
fshcheglovfshcheglov
committed
500
1 parent f8c32e3 commit c6f3dd4

File tree

4 files changed

+85
-86
lines changed

4 files changed

+85
-86
lines changed

‎test/mustachio/runtime_renderer_builder_test.dart‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ library;
88

99
import 'dart:io';
1010

11-
import 'package:analyzer/dart/element/element2.dart';
11+
import 'package:analyzer/dart/element/element.dart';
1212
import 'package:test/test.dart';
1313
import 'package:test_descriptor/test_descriptor.dart' as d;
1414

1515
import 'builder_test_base.dart';
1616

1717
void main() {
1818
group('builds a renderer class', () {
19-
late final LibraryElement2 renderersLibrary;
19+
late final LibraryElement renderersLibrary;
2020
late final String generatedContent;
2121

2222
// Builders are fairly expensive (about 4 seconds per `testBuilder` call),
@@ -61,23 +61,23 @@ class Baz {}
6161
test('for a class which is extended by a rendered class', () {
6262
// No render function is necessary.
6363
expect(renderersLibrary.getTopLevelFunction('_render_FooBase'), isNull);
64-
expect(renderersLibrary.getClass2('_Renderer_FooBase'), isNotNull);
64+
expect(renderersLibrary.getClass('_Renderer_FooBase'), isNotNull);
6565
});
6666

6767
test('for a class which is mixed into a rendered class', () {
6868
// No render function is necessary.
6969
expect(renderersLibrary.getTopLevelFunction('_render_Mix'), isNull);
70-
expect(renderersLibrary.getClass2('_Renderer_Mix'), isNotNull);
70+
expect(renderersLibrary.getClass('_Renderer_Mix'), isNotNull);
7171
});
7272

7373
test('for a type found in a getter', () {
7474
expect(renderersLibrary.getTopLevelFunction('_render_Bar'), isNotNull);
75-
expect(renderersLibrary.getClass2('_Renderer_Bar'), isNotNull);
75+
expect(renderersLibrary.getClass('_Renderer_Bar'), isNotNull);
7676
});
7777

7878
test('for a generic, bounded type found in a getter', () {
7979
expect(renderersLibrary.getTopLevelFunction('_render_Baz'), isNotNull);
80-
expect(renderersLibrary.getClass2('_Renderer_Baz'), isNotNull);
80+
expect(renderersLibrary.getClass('_Renderer_Baz'), isNotNull);
8181
});
8282

8383
test('with a property map', () {
@@ -194,8 +194,8 @@ import 'annotations.dart';
194194

195195
expect(renderersLibrary.getTopLevelFunction('renderFoo'), isNotNull);
196196
expect(renderersLibrary.getTopLevelFunction('renderBar'), isNotNull);
197-
expect(renderersLibrary.getClass2('_Renderer_Foo'), isNotNull);
198-
expect(renderersLibrary.getClass2('_Renderer_Bar'), isNotNull);
197+
expect(renderersLibrary.getClass('_Renderer_Foo'), isNotNull);
198+
expect(renderersLibrary.getClass('_Renderer_Bar'), isNotNull);
199199
});
200200

201201
group('builds a renderer class for a generic type', () {
@@ -270,18 +270,18 @@ class Baz {}
270270
var renderersLibrary = await resolveGeneratedLibrary2(runtimeRenderersPath);
271271

272272
var fooRenderFunction = renderersLibrary.getTopLevelFunction('renderFoo')!;
273-
expect(fooRenderFunction.typeParameters2, hasLength(1));
274-
var fBound = fooRenderFunction.typeParameters2.single.bound!;
273+
expect(fooRenderFunction.typeParameters, hasLength(1));
274+
var fBound = fooRenderFunction.typeParameters.single.bound!;
275275
expect(fBound.getDisplayString(), equals('num'));
276276

277-
var fooRendererClass = renderersLibrary.getClass2('_Renderer_Foo')!;
278-
expect(fooRendererClass.typeParameters2, hasLength(1));
279-
var cBound = fooRenderFunction.typeParameters2.single.bound!;
277+
var fooRendererClass = renderersLibrary.getClass('_Renderer_Foo')!;
278+
expect(fooRendererClass.typeParameters, hasLength(1));
279+
var cBound = fooRenderFunction.typeParameters.single.bound!;
280280
expect(cBound.getDisplayString(), equals('num'));
281281
});
282282

283283
group('does not generate a renderer', () {
284-
late final LibraryElement2 renderersLibrary;
284+
late final LibraryElement renderersLibrary;
285285

286286
setUpAll(() async {
287287
await testMustachioBuilder('''
@@ -304,27 +304,27 @@ class Method {}
304304

305305
test('found in a static getter', () {
306306
expect(renderersLibrary.getTopLevelFunction('_render_Static'), isNull);
307-
expect(renderersLibrary.getClass2('_Renderer_Static'), isNull);
307+
expect(renderersLibrary.getClass('_Renderer_Static'), isNull);
308308
});
309309

310310
test('found in a private getter', () {
311311
expect(renderersLibrary.getTopLevelFunction('_render_Private'), isNull);
312-
expect(renderersLibrary.getClass2('_Renderer_Private'), isNull);
312+
expect(renderersLibrary.getClass('_Renderer_Private'), isNull);
313313
});
314314

315315
test('found in a setter', () {
316316
expect(renderersLibrary.getTopLevelFunction('_render_Setter'), isNull);
317-
expect(renderersLibrary.getClass2('_Renderer_Setter'), isNull);
317+
expect(renderersLibrary.getClass('_Renderer_Setter'), isNull);
318318
});
319319

320320
test('found in a method', () {
321321
expect(renderersLibrary.getTopLevelFunction('_render_Method'), isNull);
322-
expect(renderersLibrary.getClass2('_Renderer_Method'), isNull);
322+
expect(renderersLibrary.getClass('_Renderer_Method'), isNull);
323323
});
324324

325325
test('for types not @visibleToMustache', () {
326326
expect(renderersLibrary.getTopLevelFunction('_render_String'), isNull);
327-
expect(renderersLibrary.getClass2('_Renderer_String'), isNull);
327+
expect(renderersLibrary.getClass('_Renderer_String'), isNull);
328328
});
329329
});
330330
}

‎tool/mustachio/builder.dart‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@ Future<void> build(
4646
'${libraryResult.runtimeType}');
4747
}
4848

49-
var library = libraryResult.element2;
49+
var library = libraryResult.element;
5050
var typeProvider = library.typeProvider;
5151
var typeSystem = library.typeSystem;
5252
var rendererSpecs = <RendererSpec>{};
53-
for (var renderer in library.metadata2.annotations
54-
.where((e) => e.element2!.enclosingElement2!.name3 == 'Renderer')) {
53+
for (var renderer in library.metadata.annotations
54+
.where((e) => e.element!.enclosingElement!.name == 'Renderer')) {
5555
rendererSpecs.add(_buildRendererSpec(renderer));
5656
}
5757

‎tool/mustachio/codegen_aot_compiler.dart‎

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

55
import 'dart:io';
66

7-
import 'package:analyzer/dart/element/element2.dart';
7+
import 'package:analyzer/dart/element/element.dart';
88
import 'package:analyzer/dart/element/type.dart';
99
import 'package:analyzer/dart/element/type_provider.dart';
1010
import 'package:analyzer/dart/element/type_system.dart';
@@ -213,22 +213,22 @@ Future<String> _redirectingMethod(
213213
var buffer = StringBuffer()..write('String ${compiler._rendererName}');
214214

215215
buffer.writeTypeParameters(compiler._usedContextStack
216-
.expand((c) => c.type.element3.typeParameters2));
216+
.expand((c) => c.type.element.typeParameters));
217217
buffer.write('(');
218218

219219
for (var context in compiler._usedContextStack) {
220-
var contextElement = context.type.element3;
220+
var contextElement = context.type.element;
221221
buffer.write(contextElement.displayName);
222-
if (contextElement.typeParameters2.isNotEmpty) {
222+
if (contextElement.typeParameters.isNotEmpty) {
223223
buffer.write('<');
224224
}
225-
for (var tp in contextElement.typeParameters2) {
226-
buffer.write(tp.name3);
227-
if (tp != contextElement.typeParameters2.last) {
225+
for (var tp in contextElement.typeParameters) {
226+
buffer.write(tp.name);
227+
if (tp != contextElement.typeParameters.last) {
228228
buffer.write(', ');
229229
}
230230
}
231-
if (contextElement.typeParameters2.isNotEmpty) {
231+
if (contextElement.typeParameters.isNotEmpty) {
232232
buffer.write('>');
233233
}
234234
buffer.write(' ${context.name}');
@@ -368,27 +368,27 @@ class _AotCompiler {
368368
// this should be perfectly possible.
369369

370370
var referenceElements = buffer.writeTypeParameters(
371-
_usedContexts.expand((c) => c.type.element3.typeParameters2),
371+
_usedContexts.expand((c) => c.type.element.typeParameters),
372372
);
373373
for (var element in referenceElements) {
374374
referenceUris.add(_elementUri(element));
375375
}
376376
buffer.write('(');
377377

378378
for (var context in _usedContexts) {
379-
var contextElement = context.type.element3;
379+
var contextElement = context.type.element;
380380
referenceUris.add(_elementUri(contextElement));
381381
buffer.write(contextElement.displayName);
382-
if (contextElement.typeParameters2.isNotEmpty) {
382+
if (contextElement.typeParameters.isNotEmpty) {
383383
buffer.write('<');
384384
}
385-
for (var tp in contextElement.typeParameters2) {
386-
buffer.write(tp.name3);
387-
if (tp != contextElement.typeParameters2.last) {
385+
for (var tp in contextElement.typeParameters) {
386+
buffer.write(tp.name);
387+
if (tp != contextElement.typeParameters.last) {
388388
buffer.write(', ');
389389
}
390390
}
391-
if (contextElement.typeParameters2.isNotEmpty) {
391+
if (contextElement.typeParameters.isNotEmpty) {
392392
buffer.write('>');
393393
}
394394
buffer.write(' ${context.name}');
@@ -406,8 +406,8 @@ class _AotCompiler {
406406
}
407407

408408
/// Returns the URI of [element] for use in generated import directives.
409-
String _elementUri(Element2 element) {
410-
var libraryElement = element.library2!;
409+
String _elementUri(Element element) {
410+
var libraryElement = element.library!;
411411
var libraryUri = libraryElement.firstFragment.source.uri;
412412
if (libraryUri.scheme == 'file') {
413413
return path.relative(libraryUri.path,
@@ -577,8 +577,8 @@ class _BlockCompiler {
577577
// for [Iterable], and then use [DartType.asInstanceOf] to ultimately
578578
// determine that the inner type of the loop is, for example,
579579
// `Future<int>`.
580-
var iterableElement = typeProvider.iterableElement2;
581-
var iterableType = variableLookup.type.asInstanceOf2(iterableElement)!;
580+
var iterableElement = typeProvider.iterableElement;
581+
var iterableType = variableLookup.type.asInstanceOf(iterableElement)!;
582582
var innerContextType = iterableType.typeArguments.first as InterfaceType;
583583
var innerContext = _VariableLookup(innerContextType, newContextName);
584584
_contextStack.push(innerContext);
@@ -636,7 +636,7 @@ class _BlockCompiler {
636636
late _VariableLookup context;
637637
GetterElement? getter;
638638
for (var c in _contextStack) {
639-
getter = c.type.lookUpGetter3(primaryName, contextType.element3.library2);
639+
getter = c.type.lookUpGetter(primaryName, contextType.element.library);
640640
if (getter != null) {
641641
context = c;
642642
_usedContextTypes.add(c);
@@ -661,7 +661,7 @@ class _BlockCompiler {
661661
: '${context.name}.$primaryName';
662662
var remainingNames = [...key.skip(1)];
663663
for (var secondaryKey in remainingNames) {
664-
getter = type.lookUpGetter3(secondaryKey, type.element3.library2);
664+
getter = type.lookUpGetter(secondaryKey, type.element.library);
665665
if (getter == null) {
666666
throw MustachioResolutionException(node.keySpan.message(
667667
"Failed to resolve '$secondaryKey' on ${context.type} while "
@@ -919,9 +919,9 @@ extension<T> on List<T> {
919919
}
920920

921921
extension on StringBuffer {
922-
Set<Element2> writeTypeParameters(
923-
Iterable<TypeParameterElement2> typeParameters) {
924-
var referencedElements = <Element2>{};
922+
Set<Element> writeTypeParameters(
923+
Iterable<TypeParameterElement> typeParameters) {
924+
var referencedElements = <Element>{};
925925
var hasTypeParameters = false;
926926
for (var typeParameter in typeParameters) {
927927
if (!hasTypeParameters) {
@@ -933,11 +933,11 @@ extension on StringBuffer {
933933

934934
var bound = typeParameter.bound;
935935
if (bound == null) {
936-
write(typeParameter.name3);
936+
write(typeParameter.name);
937937
} else {
938938
var boundElement = bound.documentableElement2!;
939939
referencedElements.add(boundElement);
940-
write('${typeParameter.name3} extends ${boundElement.name3!}');
940+
write('${typeParameter.name} extends ${boundElement.name!}');
941941
}
942942
}
943943
if (hasTypeParameters) {

0 commit comments

Comments
 (0)