Skip to content

Commit 73689ae

Browse files
fshcheglovfshcheglov
committed
all
1 parent 52875b6 commit 73689ae

File tree

12 files changed

+67
-64
lines changed

12 files changed

+67
-64
lines changed

‎lib/src/model/parameter.dart‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,28 @@
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-
import 'package:analyzer/dart/element/element2.dart';
5+
import 'package:analyzer/dart/element/element.dart';
6+
67
// ignore: implementation_imports
7-
import 'package:analyzer/src/dart/element/member.dart' show ParameterMember;
8+
import 'package:analyzer/src/dart/element/member.dart'
9+
show SubstitutedFormalParameterElementImpl;
810
import 'package:dartdoc/src/element_type.dart';
911
import 'package:dartdoc/src/model/comment_referable.dart';
1012
import 'package:dartdoc/src/model/kind.dart';
1113
import 'package:dartdoc/src/model/model.dart';
1214

1315
class Parameter extends ModelElement with HasNoPage {
14-
1516
@override
1617
final FormalParameterElement element;
1718

1819
Parameter(this.element, super.library, super.packageGraph,
19-
{ParameterMember? super.originalMember});
20+
{SubstitutedFormalParameterElementImpl? super.originalMember});
2021

21-
String? get defaultValue =>
22-
hasDefaultValue ? element.defaultValueCode : null;
22+
String? get defaultValue => hasDefaultValue ? element.defaultValueCode : null;
2323

2424
@override
2525
ModelElement? get enclosingElement {
26-
final enclosingElement = element.enclosingElement2;
26+
final enclosingElement = element.enclosingElement;
2727
return enclosingElement == null
2828
? null
2929
: getModelFor(enclosingElement, library);
@@ -39,21 +39,21 @@ class Parameter extends ModelElement with HasNoPage {
3939

4040
@override
4141
String get htmlId {
42-
final enclosingElement = element.enclosingElement2;
42+
final enclosingElement = element.enclosingElement;
4343
if (enclosingElement == null) {
4444
return 'param-$name';
4545
}
4646
var enclosingName = enclosingElement.lookupName;
4747
if (enclosingName == 'new') {
4848
enclosingName = '';
4949
}
50-
if (enclosingElement is GenericFunctionTypeElement2) {
50+
if (enclosingElement is GenericFunctionTypeElement) {
5151
// TODO(jcollins-g): Drop when GenericFunctionTypeElement populates
5252
// name. Also, allowing null here is allowed as a workaround for
5353
// dart-lang/sdk#32005.
54-
for (Element2 e = enclosingElement;
55-
e.enclosingElement2 != null;
56-
e = e.enclosingElement2!) {
54+
for (Element e = enclosingElement;
55+
e.enclosingElement != null;
56+
e = e.enclosingElement!) {
5757
enclosingName = e.lookupName;
5858
if (enclosingName != null && enclosingName.isNotEmpty) break;
5959
}
@@ -101,8 +101,8 @@ class Parameter extends ModelElement with HasNoPage {
101101
}
102102

103103
@override
104-
ParameterMember? get originalMember =>
105-
super.originalMember as ParameterMember?;
104+
SubstitutedFormalParameterElementImpl? get originalMember =>
105+
super.originalMember as SubstitutedFormalParameterElementImpl?;
106106

107107
late final ElementType modelType =
108108
getTypeFor((originalMember ?? element).type, library);

‎lib/src/model/prefix.dart‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,22 @@
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-
import 'package:analyzer/dart/element/element2.dart';
5+
import 'package:analyzer/dart/element/element.dart';
66
import 'package:analyzer/dart/element/scope.dart';
77
import 'package:dartdoc/src/model/comment_referable.dart';
88
import 'package:dartdoc/src/model/kind.dart';
99
import 'package:dartdoc/src/model/model.dart';
1010

11-
/// Represents a [PrefixElement2] for dartdoc.
11+
/// Represents a [PrefixElement] for dartdoc.
1212
///
1313
/// Like [Parameter], it doesn't have doc pages, but participates in lookups.
1414
/// Forwards to its referenced library if referred to directly.
1515
class Prefix extends ModelElement with HasNoPage {
1616
@override
17-
final PrefixElement2 element;
17+
final PrefixElement element;
1818

1919
/// [library] is the library the prefix is defined in, not the [Library]
20-
/// referred to by the [PrefixElement2].
20+
/// referred to by the [PrefixElement].
2121
Prefix(this.element, super.library, super.packageGraph);
2222

2323
@override
@@ -28,13 +28,13 @@ class Prefix extends ModelElement with HasNoPage {
2828
late final Library associatedLibrary =
2929
getModelForElement(_importedLibraryElement) as Library;
3030

31-
LibraryElement2 get _importedLibraryElement {
31+
LibraryElement get _importedLibraryElement {
3232
final importLists =
33-
library.element.fragments.map((fragment) => fragment.libraryImports2);
33+
library.element.fragments.map((fragment) => fragment.libraryImports);
3434
var libraryImport = importLists
3535
.expand((import) => import)
36-
.firstWhere((i) => i.prefix2?.element == element);
37-
var importedLibrary = libraryImport.importedLibrary2;
36+
.firstWhere((i) => i.prefix?.element == element);
37+
var importedLibrary = libraryImport.importedLibrary;
3838
if (importedLibrary == null) {
3939
var message = 'Unexpected null LibraryElement2 for imported library at '
4040
'${library.element.firstFragment.source.uri}, at offset '

‎lib/src/model/top_level_variable.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
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-
import 'package:analyzer/dart/element/element2.dart';
5+
import 'package:analyzer/dart/element/element.dart';
66
import 'package:dartdoc/src/model/attribute.dart';
77
import 'package:dartdoc/src/model/comment_referable.dart';
88
import 'package:dartdoc/src/model/kind.dart';
@@ -13,7 +13,7 @@ class TopLevelVariable extends ModelElement
1313
with GetterSetterCombo, Categorization {
1414

1515
@override
16-
final TopLevelVariableElement2 element;
16+
final TopLevelVariableElement element;
1717

1818
@override
1919
final Accessor? getter;

‎lib/src/model/type_parameter.dart‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
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-
import 'package:analyzer/dart/element/element2.dart';
5+
import 'package:analyzer/dart/element/element.dart';
66
import 'package:dartdoc/src/element_type.dart';
77
import 'package:dartdoc/src/model/comment_referable.dart';
88
import 'package:dartdoc/src/model/kind.dart';
@@ -11,13 +11,13 @@ import 'package:dartdoc/src/model/model.dart';
1111
class TypeParameter extends ModelElement with HasNoPage {
1212

1313
@override
14-
final TypeParameterElement2 element;
14+
final TypeParameterElement element;
1515

1616
TypeParameter(this.element, super.library, super.packageGraph);
1717

1818
@override
1919
ModelElement get enclosingElement =>
20-
getModelFor(element.enclosingElement2!, library);
20+
getModelFor(element.enclosingElement!, library);
2121

2222
/// [TypeParameter]s don't have documentation pages, and don't link to the
2323
/// element on which they are declared.
@@ -39,13 +39,13 @@ class TypeParameter extends ModelElement with HasNoPage {
3939

4040
@override
4141
String get name => element.bound != null
42-
? '${element.name3} extends ${boundType!.nameWithGenerics}'
43-
: element.name3!;
42+
? '${element.name} extends ${boundType!.nameWithGenerics}'
43+
: element.name!;
4444

4545
@override
4646
String get linkedName => element.bound != null
47-
? '${element.name3} extends ${boundType!.linkedName}'
48-
: element.name3!;
47+
? '${element.name} extends ${boundType!.linkedName}'
48+
: element.name!;
4949

5050
@override
5151
late final Map<String, CommentReferable> referenceChildren = () {
@@ -58,7 +58,7 @@ class TypeParameter extends ModelElement with HasNoPage {
5858
Iterable<CommentReferable> get referenceParents => [enclosingElement];
5959

6060
@override
61-
String get referenceName => element.name3!;
61+
String get referenceName => element.name!;
6262
}
6363

6464
/// A mixin for [ModelElement]s which have type parameters.

‎lib/src/model/typedef.dart‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
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-
import 'package:analyzer/dart/element/element2.dart';
5+
import 'package:analyzer/dart/element/element.dart';
66
import 'package:analyzer/dart/element/type.dart';
77
import 'package:dartdoc/src/element_type.dart';
88
import 'package:dartdoc/src/model/comment_referable.dart';
@@ -13,7 +13,7 @@ abstract class Typedef extends ModelElement
1313
with TypeParameters, Categorization {
1414

1515
@override
16-
final TypeAliasElement2 element;
16+
final TypeAliasElement element;
1717

1818
Typedef(this.element, super.library, super.packageGraph);
1919

@@ -62,7 +62,7 @@ abstract class Typedef extends ModelElement
6262
Kind get kind => Kind.typedef;
6363

6464
@override
65-
List<TypeParameter> get typeParameters => element.typeParameters2
65+
List<TypeParameter> get typeParameters => element.typeParameters
6666
.map((f) => getModelFor(f, library) as TypeParameter)
6767
.toList(growable: false);
6868

@@ -130,7 +130,7 @@ class FunctionTypedef extends Typedef {
130130
'Expected callable but: ${element.runtimeType} is FunctionTypedElement '
131131
'|| (${element.runtimeType} is TypeAliasElement && '
132132
'${element.aliasedType.runtimeType} is FunctionType) is not true for '
133-
'"${element.name3}" in "${element.library2}"');
133+
'"${element.name}" in "${element.library}"');
134134
}
135135

136136
@override

‎lib/src/model_utils.dart‎

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

55
import 'dart:io' show Platform;
66

7-
import 'package:analyzer/dart/element/element2.dart';
7+
import 'package:analyzer/dart/element/element.dart';
88
import 'package:dartdoc/src/failure.dart';
99
import 'package:dartdoc/src/model/model.dart';
1010
import 'package:glob/glob.dart';
@@ -52,9 +52,9 @@ Iterable<T> filterHasCanonical<T extends ModelElement>(
5252
return maybeHasCanonicalItems.where((me) => me.canonicalModelElement != null);
5353
}
5454

55-
extension ElementExtension on Element2 {
55+
extension ElementExtension on Element {
5656
bool get hasPrivateName {
57-
final name = name3;
57+
final name = this.name;
5858
if (name == null) return false;
5959

6060
if (name.startsWith('_')) {
@@ -65,8 +65,8 @@ extension ElementExtension on Element2 {
6565

6666
// GenericFunctionTypeElements have the name we care about in the enclosing
6767
// element.
68-
if (self is GenericFunctionTypeElement2) {
69-
var enclosingElementName = self.enclosingElement2?.name3;
68+
if (self is GenericFunctionTypeElement) {
69+
var enclosingElementName = self.enclosingElement?.name;
7070
if (enclosingElementName != null &&
7171
enclosingElementName.startsWith('_')) {
7272
return true;

‎lib/src/mustachio/annotations.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// See the Mustachio README at tool/mustachio/README.md for high-level
66
// documentation.
77

8-
import 'package:analyzer/dart/element/element2.dart';
8+
import 'package:analyzer/dart/element/element.dart';
99
import 'package:analyzer/dart/element/type.dart';
1010
import 'package:meta/meta.dart';
1111

@@ -89,5 +89,5 @@ class RendererSpec {
8989
this.standardHtmlTemplate,
9090
);
9191

92-
InterfaceElement2 get contextElement => contextType.element3;
92+
InterfaceElement get contextElement => contextType.element;
9393
}

‎lib/src/package_meta.dart‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@
44

55
import 'dart:io' show Platform;
66

7-
import 'package:analyzer/dart/element/element2.dart';
7+
import 'package:analyzer/dart/element/element.dart';
88
import 'package:analyzer/file_system/file_system.dart';
99
import 'package:analyzer/file_system/physical_file_system.dart';
10+
1011
// ignore: implementation_imports
1112
import 'package:analyzer/src/generated/sdk.dart' show DartSdk;
1213
import 'package:dartdoc/src/failure.dart';
@@ -49,13 +50,13 @@ final PackageMetaProvider pubPackageMetaProvider = PackageMetaProvider(
4950
/// Sets the supported way of constructing [PackageMeta] objects.
5051
///
5152
/// These objects can be constructed from a filename, a directory
52-
/// or a [LibraryElement2]. We allow different dartdoc implementations to
53+
/// or a [LibraryElement]. We allow different dartdoc implementations to
5354
/// provide their own [PackageMeta] types.
5455
///
5556
/// By using a different provider, these implementations can control how
5657
/// [PackageMeta] objects are built.
5758
class PackageMetaProvider {
58-
final PackageMeta? Function(LibraryElement2, String, ResourceProvider)
59+
final PackageMeta? Function(LibraryElement, String, ResourceProvider)
5960
_fromElement;
6061
final PackageMeta? Function(String, ResourceProvider) _fromFilename;
6162
final PackageMeta? Function(Folder, ResourceProvider) _fromDir;
@@ -75,9 +76,11 @@ class PackageMetaProvider {
7576
this.defaultSdk,
7677
});
7778

78-
PackageMeta? fromElement(LibraryElement2 library, String s) =>
79+
PackageMeta? fromElement(LibraryElement library, String s) =>
7980
_fromElement(library, s, resourceProvider);
81+
8082
PackageMeta? fromFilename(String s) => _fromFilename(s, resourceProvider);
83+
8184
PackageMeta? fromDir(Folder dir) => _fromDir(dir, resourceProvider);
8285
}
8386

@@ -183,7 +186,7 @@ abstract class PubPackageMeta extends PackageMeta {
183186
}
184187

185188
/// Use this instead of [fromDir] where possible.
186-
static PackageMeta? fromElement(LibraryElement2 libraryElement, String sdkDir,
189+
static PackageMeta? fromElement(LibraryElement libraryElement, String sdkDir,
187190
ResourceProvider resourceProvider) {
188191
if (libraryElement.isInSdk) {
189192
return PubPackageMeta.fromDir(

‎lib/src/type_utils.dart‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
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-
import 'package:analyzer/dart/element/element2.dart';
5+
import 'package:analyzer/dart/element/element.dart';
66
import 'package:analyzer/dart/element/type.dart';
77

88
extension DartTypeExtension on DartType {
@@ -11,12 +11,12 @@ extension DartTypeExtension on DartType {
1111
///
1212
/// For example, the documentable element of [DynamicType] is `null`, as there
1313
/// is no documentation for `dynamic` which we can link to.
14-
TypeDefiningElement2? get documentableElement2 {
14+
TypeDefiningElement? get documentableElement2 {
1515
final self = this;
1616
return switch (self) {
17-
InterfaceType() => self.element3,
18-
NeverType() => self.element3 as TypeDefiningElement2,
19-
TypeParameterType() => self.element3,
17+
InterfaceType() => self.element,
18+
NeverType() => self.element as TypeDefiningElement,
19+
TypeParameterType() => self.element,
2020
_ => null
2121
};
2222
}

‎lib/src/warnings.dart‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import 'dart:io';
66
import 'dart:math' as math;
77

8-
import 'package:analyzer/dart/element/element2.dart';
8+
import 'package:analyzer/dart/element/element.dart';
99
import 'package:analyzer/file_system/file_system.dart';
1010
import 'package:collection/collection.dart';
1111
import 'package:dartdoc/src/dartdoc_options.dart';
@@ -95,7 +95,7 @@ List<DartdocOption<Object?>> createPackageWarningOptions(
9595
/// Something that package warnings can be reported on. Optionally associated
9696
/// with an analyzer [element].
9797
mixin Warnable implements CommentReferable, Documentable, Locatable {
98-
Element2? get element;
98+
Element? get element;
9999

100100
void warn(
101101
PackageWarning kind, {
@@ -462,7 +462,7 @@ class PackageWarningOptions {
462462
}
463463

464464
class PackageWarningCounter {
465-
final Map<Element2?, Map<PackageWarning, Set<String>>> _countedWarnings = {};
465+
final Map<Element?, Map<PackageWarning, Set<String>>> _countedWarnings = {};
466466
final _items = <Jsonable>[];
467467
final _displayedWarningCounts = <PackageWarning, int>{};
468468
final PackageGraph packageGraph;
@@ -479,7 +479,7 @@ class PackageWarningCounter {
479479

480480
/// An unmodifiable map view of all counted warnings related by their element,
481481
/// warning type, and message.
482-
UnmodifiableMapView<Element2?, Map<PackageWarning, Set<String>>>
482+
UnmodifiableMapView<Element?, Map<PackageWarning, Set<String>>>
483483
get countedWarnings => UnmodifiableMapView(_countedWarnings);
484484

485485
PackageWarningCounter(this.packageGraph);

0 commit comments

Comments
 (0)