|
2 | 2 | // for details. All rights reserved. Use of this source code is governed by a |
3 | 3 | // BSD-style license that can be found in the LICENSE file. |
4 | 4 |
|
5 | | -// ignore_for_file: analyzer_use_new_elements |
6 | | - |
7 | 5 | import 'package:_fe_analyzer_shared/src/type_inference/type_analyzer_operations.dart' |
8 | 6 | show Variance; |
9 | | -import 'package:analyzer/dart/element/element.dart'; |
10 | 7 | import 'package:analyzer/dart/element/element2.dart'; |
11 | 8 | import 'package:analyzer/dart/element/nullability_suffix.dart'; |
12 | 9 | import 'package:analyzer/dart/element/type.dart'; |
13 | 10 | import 'package:analyzer/src/dart/element/element.dart'; |
| 11 | +import 'package:analyzer/src/dart/element/member.dart'; |
14 | 12 | import 'package:analyzer/src/dart/element/type.dart'; |
15 | 13 | import 'package:analyzer/src/dart/element/type_algebra.dart'; |
16 | 14 | import 'package:analyzer/src/utilities/extensions/element.dart'; |
@@ -129,7 +127,10 @@ class ElementDisplayStringBuilder { |
129 | 127 | _write(name); |
130 | 128 |
|
131 | 129 | if (element.kind != ElementKind.GETTER) { |
132 | | - _writeTypeParameters(element.typeParameters); |
| 130 | + var typeParameters = (element is ExecutableElementImpl) |
| 131 | + ? element.typeParameters |
| 132 | + : (element as ExecutableMember).typeParameters; |
| 133 | + _writeTypeParameters(typeParameters); |
133 | 134 | _writeFormalParameters( |
134 | 135 | element.parameters, |
135 | 136 | forElement: true, |
@@ -409,12 +410,6 @@ class ElementDisplayStringBuilder { |
409 | 410 | } |
410 | 411 |
|
411 | 412 | void writeVariableElement(VariableElementOrMember element) { |
412 | | - switch (element) { |
413 | | - case FieldElement(isAugmentation: true): |
414 | | - case TopLevelVariableElement(isAugmentation: true): |
415 | | - _write('augment '); |
416 | | - } |
417 | | - |
418 | 413 | _writeType(element.type); |
419 | 414 | _write(' '); |
420 | 415 | _write(element.displayName); |
@@ -547,15 +542,15 @@ class ElementDisplayStringBuilder { |
547 | 542 | } |
548 | 543 | } |
549 | 544 |
|
550 | | - void _writeTypeParameters(List<TypeParameterElement> elements) { |
| 545 | + void _writeTypeParameters(List<TypeParameterElementImpl> elements) { |
551 | 546 | if (elements.isEmpty) return; |
552 | 547 |
|
553 | 548 | _write('<'); |
554 | 549 | for (var i = 0; i < elements.length; i++) { |
555 | 550 | if (i != 0) { |
556 | 551 | _write(', '); |
557 | 552 | } |
558 | | - (elements[i] as TypeParameterElementImpl).appendTo(this); |
| 553 | + elements[i].appendTo(this); |
559 | 554 | } |
560 | 555 | _write('>'); |
561 | 556 | } |
@@ -672,7 +667,7 @@ class ElementDisplayStringBuilder { |
672 | 667 |
|
673 | 668 | enum _WriteFormalParameterKind { requiredPositional, optionalPositional, named } |
674 | 669 |
|
675 | | -extension on LibraryImportElement { |
| 670 | +extension on LibraryImportElementImpl { |
676 | 671 | String get libraryName { |
677 | 672 | if (uri case DirectiveUriWithRelativeUriString uri) { |
678 | 673 | return uri.relativeUriString; |
|
0 commit comments