Skip to content

Commit 6659d54

Browse files
bwilkersonCommit Queue
authored andcommitted
[migrate] display_string_builder.dart
Change-Id: I5e02318292151adcf8d3672860cf20847aa8ccef Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/416764 Reviewed-by: Konstantin Shcheglov <[email protected]> Commit-Queue: Brian Wilkerson <[email protected]>
1 parent 9726e92 commit 6659d54

File tree

1 file changed

+8
-13
lines changed

1 file changed

+8
-13
lines changed

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

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,13 @@
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:_fe_analyzer_shared/src/type_inference/type_analyzer_operations.dart'
86
show Variance;
9-
import 'package:analyzer/dart/element/element.dart';
107
import 'package:analyzer/dart/element/element2.dart';
118
import 'package:analyzer/dart/element/nullability_suffix.dart';
129
import 'package:analyzer/dart/element/type.dart';
1310
import 'package:analyzer/src/dart/element/element.dart';
11+
import 'package:analyzer/src/dart/element/member.dart';
1412
import 'package:analyzer/src/dart/element/type.dart';
1513
import 'package:analyzer/src/dart/element/type_algebra.dart';
1614
import 'package:analyzer/src/utilities/extensions/element.dart';
@@ -129,7 +127,10 @@ class ElementDisplayStringBuilder {
129127
_write(name);
130128

131129
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);
133134
_writeFormalParameters(
134135
element.parameters,
135136
forElement: true,
@@ -409,12 +410,6 @@ class ElementDisplayStringBuilder {
409410
}
410411

411412
void writeVariableElement(VariableElementOrMember element) {
412-
switch (element) {
413-
case FieldElement(isAugmentation: true):
414-
case TopLevelVariableElement(isAugmentation: true):
415-
_write('augment ');
416-
}
417-
418413
_writeType(element.type);
419414
_write(' ');
420415
_write(element.displayName);
@@ -547,15 +542,15 @@ class ElementDisplayStringBuilder {
547542
}
548543
}
549544

550-
void _writeTypeParameters(List<TypeParameterElement> elements) {
545+
void _writeTypeParameters(List<TypeParameterElementImpl> elements) {
551546
if (elements.isEmpty) return;
552547

553548
_write('<');
554549
for (var i = 0; i < elements.length; i++) {
555550
if (i != 0) {
556551
_write(', ');
557552
}
558-
(elements[i] as TypeParameterElementImpl).appendTo(this);
553+
elements[i].appendTo(this);
559554
}
560555
_write('>');
561556
}
@@ -672,7 +667,7 @@ class ElementDisplayStringBuilder {
672667

673668
enum _WriteFormalParameterKind { requiredPositional, optionalPositional, named }
674669

675-
extension on LibraryImportElement {
670+
extension on LibraryImportElementImpl {
676671
String get libraryName {
677672
if (uri case DirectiveUriWithRelativeUriString uri) {
678673
return uri.relativeUriString;

0 commit comments

Comments
 (0)