Skip to content

Commit 9965645

Browse files
committed
Replace member.dart with API classes
1 parent 72a0194 commit 9965645

File tree

5 files changed

+442
-465
lines changed

5 files changed

+442
-465
lines changed

lib/src/model/accessor.dart

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ import 'dart:convert';
66

77
import 'package:analyzer/dart/element/element.dart';
88
import 'package:analyzer/source/line_info.dart';
9-
// ignore: implementation_imports
10-
import 'package:analyzer/src/dart/element/member.dart' show SubstitutedExecutableElementImpl;
119
import 'package:collection/collection.dart' show IterableExtension;
1210
import 'package:dartdoc/src/element_type.dart';
1311
import 'package:dartdoc/src/model/comment_referable.dart';
@@ -31,16 +29,16 @@ class Accessor extends ModelElement {
3129
late final GetterSetterCombo enclosingCombo;
3230

3331
Accessor(this.element, super.library, super.packageGraph,
34-
{SubstitutedExecutableElementImpl? super.originalMember});
32+
{ExecutableElement? super.originalElement});
3533

3634
@override
3735
CharacterLocation? get characterLocation => element.isSynthetic
3836
? enclosingCombo.characterLocation
3937
: super.characterLocation;
4038

4139
@override
42-
SubstitutedExecutableElementImpl? get originalMember =>
43-
super.originalMember as SubstitutedExecutableElementImpl?;
40+
ExecutableElement? get originalMember =>
41+
super.originalMember as ExecutableElement?;
4442

4543
late final Callable modelType =
4644
getTypeFor((originalMember ?? element).type, library) as Callable;
@@ -182,7 +180,7 @@ class ContainerAccessor extends Accessor with ContainerMember, Inheritable {
182180

183181
ContainerAccessor.inherited(
184182
super.element, super.library, super.packageGraph, this._enclosingElement,
185-
{super.originalMember})
183+
{super.originalElement})
186184
: isInherited = true;
187185

188186
/// The index and values fields are never declared, and must be special cased.

lib/src/model/method.dart

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

55
import 'package:analyzer/dart/element/element.dart';
66
import 'package:analyzer/source/line_info.dart';
7-
// ignore: implementation_imports
8-
import 'package:analyzer/src/dart/element/member.dart' show SubstitutedExecutableElementImpl;
97
import 'package:dartdoc/src/element_type.dart';
108
import 'package:dartdoc/src/model/attribute.dart';
119
import 'package:dartdoc/src/model/comment_referable.dart';
@@ -32,7 +30,7 @@ class Method extends ModelElement
3230

3331
Method.inherited(this.element, this._enclosingContainer, super.library,
3432
super.packageGraph,
35-
{SubstitutedExecutableElementImpl? super.originalMember})
33+
{ExecutableElement? super.originalElement})
3634
: _isInherited = true {
3735
_calcTypeParameters();
3836
}
@@ -42,7 +40,7 @@ class Method extends ModelElement
4240
this._enclosingContainer,
4341
super.library,
4442
super.packageGraph, {
45-
SubstitutedExecutableElementImpl? super.originalMember,
43+
ExecutableElement? super.originalElement,
4644
}) : _isInherited = false {
4745
_calcTypeParameters();
4846
}
@@ -113,8 +111,8 @@ class Method extends ModelElement
113111
Kind get kind => Kind.method;
114112

115113
@override
116-
SubstitutedExecutableElementImpl? get originalMember =>
117-
super.originalMember as SubstitutedExecutableElementImpl?;
114+
ExecutableElement? get originalMember =>
115+
super.originalMember as ExecutableElement?;
118116

119117
late final Callable modelType =
120118
getTypeFor((originalMember ?? element).type, library) as Callable;

0 commit comments

Comments
 (0)