Skip to content

Commit 1456b80

Browse files
committed
Auto merge of rust-lang#13100 - jonas-schievink:doc-links-on-impl, r=jonas-schievink
fix: Resolve doc links on impl blocks Fixes rust-lang/rust-analyzer#13089
2 parents 8dcf4c7 + 322e706 commit 1456b80

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

crates/ide/src/doc_links.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,10 +184,10 @@ pub(crate) fn resolve_doc_path_for_def(
184184
Definition::TypeAlias(it) => it.resolve_doc_path(db, link, ns),
185185
Definition::Macro(it) => it.resolve_doc_path(db, link, ns),
186186
Definition::Field(it) => it.resolve_doc_path(db, link, ns),
187+
Definition::SelfType(it) => it.resolve_doc_path(db, link, ns),
187188
Definition::BuiltinAttr(_)
188189
| Definition::ToolModule(_)
189190
| Definition::BuiltinType(_)
190-
| Definition::SelfType(_)
191191
| Definition::Local(_)
192192
| Definition::GenericParam(_)
193193
| Definition::Label(_)

crates/ide/src/syntax_highlighting/test_data/highlight_doctest.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
<span class="field declaration">bar</span><span class="colon">:</span> <span class="builtin_type">bool</span><span class="comma">,</span>
5757
<span class="brace">}</span>
5858

59-
<span class="comment documentation">/// This is an impl with a code block.</span>
59+
<span class="comment documentation">/// This is an impl of </span><span class="struct documentation injected intra_doc_link">[`Foo`]</span><span class="comment documentation"> with a code block.</span>
6060
<span class="comment documentation">///</span>
6161
<span class="comment documentation">/// ```</span>
6262
<span class="comment documentation">///</span><span class="comment documentation"> </span><span class="keyword injected">fn</span><span class="none injected"> </span><span class="function declaration injected">foo</span><span class="parenthesis injected">(</span><span class="parenthesis injected">)</span><span class="none injected"> </span><span class="brace injected">{</span>

crates/ide/src/syntax_highlighting/tests.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -624,7 +624,7 @@ struct Foo {
624624
bar: bool,
625625
}
626626
627-
/// This is an impl with a code block.
627+
/// This is an impl of [`Foo`] with a code block.
628628
///
629629
/// ```
630630
/// fn foo() {

0 commit comments

Comments
 (0)