|
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:analyzer/dart/element/element.dart'; |
| 6 | +import 'package:analyzer/dart/element/element2.dart'; |
8 | 7 | // ignore: implementation_imports |
9 | 8 | import 'package:analyzer/src/dart/element/member.dart' show ParameterMember; |
| 9 | +// ignore: implementation_imports |
| 10 | +import 'package:analyzer/src/utilities/extensions/element.dart'; |
10 | 11 | import 'package:dartdoc/src/element_type.dart'; |
11 | 12 | import 'package:dartdoc/src/model/comment_referable.dart'; |
12 | 13 | import 'package:dartdoc/src/model/kind.dart'; |
13 | 14 | import 'package:dartdoc/src/model/model.dart'; |
14 | 15 |
|
15 | 16 | class Parameter extends ModelElement with HasNoPage { |
16 | 17 | @override |
17 | | - final ParameterElement element; |
| 18 | + // ignore: analyzer_use_new_elements |
| 19 | + ParameterElement get element => element2.asElement; |
| 20 | + |
| 21 | + @override |
| 22 | + final FormalParameterElement element2; |
18 | 23 |
|
19 | | - Parameter(this.element, super.library, super.packageGraph, |
| 24 | + Parameter(this.element2, super.library, super.packageGraph, |
20 | 25 | {ParameterMember? super.originalMember}); |
21 | 26 |
|
22 | | - String? get defaultValue => hasDefaultValue ? element.defaultValueCode : null; |
| 27 | + String? get defaultValue => hasDefaultValue ? element2.defaultValueCode : null; |
23 | 28 |
|
24 | 29 | @override |
25 | 30 | ModelElement? get enclosingElement { |
26 | | - final enclosingElement = element.enclosingElement3; |
| 31 | + final enclosingElement = element2.enclosingElement2; |
27 | 32 | return enclosingElement == null |
28 | 33 | ? null |
29 | | - : getModelFor(enclosingElement, library); |
| 34 | + : getModelFor2(enclosingElement, library); |
30 | 35 | } |
31 | 36 |
|
32 | 37 | bool get hasDefaultValue { |
33 | | - return element.defaultValueCode != null && |
34 | | - element.defaultValueCode!.isNotEmpty; |
| 38 | + return element2.defaultValueCode != null && |
| 39 | + element2.defaultValueCode!.isNotEmpty; |
35 | 40 | } |
36 | 41 |
|
37 | 42 | @override |
38 | 43 | String? get href => null; |
39 | 44 |
|
40 | 45 | @override |
41 | 46 | String get htmlId { |
42 | | - final enclosingElement = element.enclosingElement3; |
| 47 | + final enclosingElement = element2.enclosingElement2; |
43 | 48 | if (enclosingElement == null) { |
44 | 49 | return 'param-$name'; |
45 | 50 | } |
46 | | - var enclosingName = enclosingElement.name; |
47 | | - if (enclosingElement is GenericFunctionTypeElement) { |
| 51 | + var enclosingName = enclosingElement.lookupName; |
| 52 | + if (enclosingName == 'new') { |
| 53 | + enclosingName = ''; |
| 54 | + } |
| 55 | + if (enclosingElement is GenericFunctionTypeElement2) { |
48 | 56 | // TODO(jcollins-g): Drop when GenericFunctionTypeElement populates |
49 | 57 | // name. Also, allowing null here is allowed as a workaround for |
50 | 58 | // dart-lang/sdk#32005. |
51 | | - for (Element e = enclosingElement; |
52 | | - e.enclosingElement3 != null; |
53 | | - e = e.enclosingElement3!) { |
54 | | - enclosingName = e.name; |
| 59 | + for (Element2 e = enclosingElement; |
| 60 | + e.enclosingElement2 != null; |
| 61 | + e = e.enclosingElement2!) { |
| 62 | + enclosingName = e.name3; |
55 | 63 | if (enclosingName != null && enclosingName.isNotEmpty) break; |
56 | 64 | } |
57 | | - } |
| 65 | + } |
58 | 66 | return '$enclosingName-param-$name'; |
59 | 67 | } |
60 | 68 |
|
61 | 69 | @override |
62 | | - int get hashCode => element.hashCode; |
| 70 | + int get hashCode => element2.hashCode; |
63 | 71 |
|
64 | 72 | @override |
65 | 73 | bool operator ==(Object other) => |
66 | | - other is Parameter && (element.type == other.element.type); |
| 74 | + other is Parameter && (element2.type == other.element2.type); |
67 | 75 |
|
68 | | - bool get isCovariant => element.isCovariant; |
| 76 | + bool get isCovariant => element2.isCovariant; |
69 | 77 |
|
70 | | - bool get isRequiredPositional => element.isRequiredPositional; |
| 78 | + bool get isRequiredPositional => element2.isRequiredPositional; |
71 | 79 |
|
72 | | - bool get isNamed => element.isNamed; |
| 80 | + bool get isNamed => element2.isNamed; |
73 | 81 |
|
74 | | - bool get isOptionalPositional => element.isOptionalPositional; |
| 82 | + bool get isOptionalPositional => element2.isOptionalPositional; |
75 | 83 |
|
76 | 84 | /// Only true if this is a required named parameter. |
77 | | - bool get isRequiredNamed => element.isRequiredNamed; |
| 85 | + bool get isRequiredNamed => element2.isRequiredNamed; |
78 | 86 |
|
79 | 87 | @override |
80 | 88 | Kind get kind => Kind.parameter; |
@@ -102,5 +110,5 @@ class Parameter extends ModelElement with HasNoPage { |
102 | 110 | super.originalMember as ParameterMember?; |
103 | 111 |
|
104 | 112 | late final ElementType modelType = |
105 | | - getTypeFor((originalMember ?? element).type, library); |
| 113 | + getTypeFor((originalMember ?? element2).type, library); |
106 | 114 | } |
0 commit comments