Skip to content

Compare DefinedElementTypes as equivalent with their forwarded element #2706

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
5425696
It 'works' but no tests for new functionality yet
jcollins-g Jun 25, 2021
187beb5
dartfmt
jcollins-g Jun 27, 2021
6a146e6
add tests for type parameters, handle more constructor parameter edge…
jcollins-g Jun 27, 2021
66f3b02
dartfmt rebuild
jcollins-g Jun 27, 2021
bd0bdaf
remove debugging
jcollins-g Jun 27, 2021
2379242
correct isEquivalentTo to handle element type forwarding
jcollins-g Jun 27, 2021
3659f0e
Merge branch 'master' into type-parameters-em-refactor
jcollins-g Jun 27, 2021
994cbc3
Merge branch 'type-parameters-em-refactor' into type-parameters-em-re…
jcollins-g Jun 27, 2021
54cfaa6
This was never correct, delete hrefs for type parameters
jcollins-g Jun 27, 2021
2d99d6d
Merge branch 'type-parameters-em-refactor' into type-parameters-em-re…
jcollins-g Jun 27, 2021
ef677e3
Correct a problem with inherited docs
jcollins-g Jun 27, 2021
a903699
Merge branch 'type-parameters-em-refactor' into type-parameters-em-re…
jcollins-g Jun 27, 2021
170f2c1
Remember, we need both
jcollins-g Jun 27, 2021
93eaac5
Merge branch 'type-parameters-em-refactor' into type-parameters-em-re…
jcollins-g Jun 27, 2021
6e94feb
add a fully qualified name for DefinedElementType so that the compari…
jcollins-g Jun 28, 2021
b6d2638
Merge branch 'master' into type-parameters-em-refactor
jcollins-g Jun 28, 2021
66ebc6c
Merge branch 'master' into type-parameters-em-refactor
jcollins-g Jun 28, 2021
8c6c507
Remove commented out code block
jcollins-g Jun 28, 2021
c6426a4
Merge branch 'type-parameters-em-refactor' of github.com:jcollins-g/d…
jcollins-g Jun 28, 2021
940d455
Merge branch 'master' into type-parameters-em-refactor
jcollins-g Jun 28, 2021
d5130c3
Merge branch 'type-parameters-em-refactor' into type-parameters-em-re…
jcollins-g Jun 28, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions lib/src/element_type.dart
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,9 @@ abstract class DefinedElementType extends ElementType {
@override
String get name => type.element.name;

@override
String get fullyQualifiedName => modelElement.fullyQualifiedName;

bool get isParameterType => (type is TypeParameterType);

/// This type is a public type if the underlying, canonical element is public.
Expand Down
20 changes: 20 additions & 0 deletions lib/src/generator/templates.runtime_renderers.dart
Original file line number Diff line number Diff line change
Expand Up @@ -4157,6 +4157,26 @@ class _Renderer_DefinedElementType extends RendererBase<DefinedElementType> {
parent: r, getters: _invisibleGetters['Element']);
},
),
'fullyQualifiedName': Property(
getValue: (CT_ c) => c.fullyQualifiedName,
renderVariable:
(CT_ c, Property<CT_> self, List<String> remainingNames) {
if (remainingNames.isEmpty) {
return self.getValue(c).toString();
}
var name = remainingNames.first;
var nextProperty =
_Renderer_String.propertyMap().getValue(name);
return nextProperty.renderVariable(self.getValue(c),
nextProperty, [...remainingNames.skip(1)]);
},
isNullValue: (CT_ c) => c.fullyQualifiedName == null,
renderValue: (CT_ c, RendererBase<CT_> r,
List<MustachioNode> ast, StringSink sink) {
_render_String(c.fullyQualifiedName, ast, r.template, sink,
parent: r);
},
),
'instantiatedType': Property(
getValue: (CT_ c) => c.instantiatedType,
renderVariable: (CT_ c, Property<CT_> self,
Expand Down
9 changes: 9 additions & 0 deletions lib/src/matching_link_result.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.

import 'package:dartdoc/src/element_type.dart';
import 'package:dartdoc/src/model/comment_referable.dart';
import 'package:dartdoc/src/model/model.dart';
import 'package:dartdoc/src/quiver.dart';
Expand All @@ -26,6 +27,14 @@ class MatchingLinkResult {
var compareThis = commentReferable;
var compareOther = other.commentReferable;

if (compareThis is DefinedElementType) {
compareThis = (compareThis as DefinedElementType).modelElement;
}

if (compareOther is DefinedElementType) {
compareOther = (compareOther as DefinedElementType).modelElement;
}

if (compareThis is Accessor) {
compareThis = (compareThis as Accessor).enclosingCombo;
}
Expand Down