language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-08-19 10:00:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Attach comments to ast::Impl

Browse source
This commit is contained in:
Lukas Wirth 2021-05-15 17:23:20 +02:00
parent 3da52d2e93
commit 4b5b54279a
4 changed files with 30 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
crates/ide/src/syntax_highlighting/test_data/highlight_doctest.html
View file

@ -37,13 +37,25 @@ pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd
.unresolved_reference { color: #FC5555; text-decoration: wavy underline; } .unresolved_reference { color: #FC5555; text-decoration: wavy underline; }
</style> </style>
<pre><code><span class="comment documentation">/// ```</span> <pre><code><span class="comment documentation">//! This is a module to test doc injection.</span>
<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">test</span><span class="parenthesis injected">(</span><span class="parenthesis injected">)</span><span class="none injected"> </span><span class="brace injected">{</span><span class="brace injected">}</span>
<span class="comment documentation">//! ```</span>
<span class="comment documentation">/// ```</span>
<span class="comment documentation">/// </span><span class="keyword injected">let</span><span class="none injected"> </span><span class="punctuation injected">_</span><span class="none injected"> </span><span class="operator injected">=</span><span class="none injected"> </span><span class="string_literal injected">"early doctests should not go boom"</span><span class="semicolon injected">;</span> <span class="comment documentation">/// </span><span class="keyword injected">let</span><span class="none injected"> </span><span class="punctuation injected">_</span><span class="none injected"> </span><span class="operator injected">=</span><span class="none injected"> </span><span class="string_literal injected">"early doctests should not go boom"</span><span class="semicolon injected">;</span>
<span class="comment documentation">/// ```</span> <span class="comment documentation">/// ```</span>
<span class="keyword">struct</span> <span class="struct declaration">Foo</span> <span class="brace">{</span> <span class="keyword">struct</span> <span class="struct declaration">Foo</span> <span class="brace">{</span>
<span class="field declaration">bar</span><span class="colon">:</span> <span class="builtin_type">bool</span><span class="comma">,</span> <span class="field declaration">bar</span><span class="colon">:</span> <span class="builtin_type">bool</span><span class="comma">,</span>
<span class="brace">}</span> <span class="brace">}</span>
<span class="comment documentation">/// This is an impl with a code block.</span>
<span class="comment documentation">///</span>
<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>
<span class="comment documentation">///</span>
<span class="comment documentation">/// </span><span class="brace injected">}</span>
<span class="comment documentation">/// ```</span>
<span class="keyword">impl</span> <span class="struct">Foo</span> <span class="brace">{</span> <span class="keyword">impl</span> <span class="struct">Foo</span> <span class="brace">{</span>
<span class="comment documentation">/// ```</span> <span class="comment documentation">/// ```</span>
<span class="comment documentation">/// </span><span class="keyword injected">let</span><span class="none injected"> </span><span class="punctuation injected">_</span><span class="none injected"> </span><span class="operator injected">=</span><span class="none injected"> </span><span class="string_literal injected">"Call me</span> <span class="comment documentation">/// </span><span class="keyword injected">let</span><span class="none injected"> </span><span class="punctuation injected">_</span><span class="none injected"> </span><span class="operator injected">=</span><span class="none injected"> </span><span class="string_literal injected">"Call me</span>

12
crates/ide/src/syntax_highlighting/tests.rs
View file

@ -524,6 +524,11 @@ fn main() {
fn test_highlight_doc_comment() { fn test_highlight_doc_comment() {
check_highlighting( check_highlighting(
r#" r#"
//! This is a module to test doc injection.
//! ```
//! fn test() {}
//! ```
/// ``` /// ```
/// let _ = "early doctests should not go boom"; /// let _ = "early doctests should not go boom";
/// ``` /// ```
@ -531,6 +536,13 @@ struct Foo {
bar: bool, bar: bool,
} }
/// This is an impl with a code block.
///
/// ```
/// fn foo() {
///
/// }
/// ```
impl Foo { impl Foo {
/// ``` /// ```
/// let _ = "Call me /// let _ = "Call me

4
crates/syntax/src/parsing/text_tree_sink.rs
View file

@ -147,8 +147,8 @@ fn n_attached_trivias<'a>(
trivias: impl Iterator<Item = (SyntaxKind, &'a str)>, trivias: impl Iterator<Item = (SyntaxKind, &'a str)>,
) -> usize { ) -> usize {
match kind { match kind {
MACRO_CALL | MACRO_RULES | MACRO_DEF | CONST | TYPE_ALIAS | STRUCT | UNION | ENUM CONST | ENUM | FN | IMPL | MACRO_CALL | MACRO_DEF | MACRO_RULES | MODULE | RECORD_FIELD
| VARIANT | FN | TRAIT | MODULE | RECORD_FIELD | STATIC | USE => { | STATIC | STRUCT | TRAIT | TUPLE_FIELD | TYPE_ALIAS | UNION | USE | VARIANT => {
let mut res = 0; let mut res = 0;
let mut trivias = trivias.enumerate().peekable(); let mut trivias = trivias.enumerate().peekable();

2
crates/syntax/test_data/parser/ok/0045_block_attrs.rast
View file

@ -127,9 +127,9 @@ SOURCE_FILE@0..764
WHITESPACE@537..538 "\n" WHITESPACE@537..538 "\n"
R_CURLY@538..539 "}" R_CURLY@538..539 "}"
WHITESPACE@539..541 "\n\n" WHITESPACE@539..541 "\n\n"
IMPL@541..763
COMMENT@541..601 "// https://github.com ..." COMMENT@541..601 "// https://github.com ..."
WHITESPACE@601..602 "\n" WHITESPACE@601..602 "\n"
IMPL@602..763
IMPL_KW@602..606 "impl" IMPL_KW@602..606 "impl"
WHITESPACE@606..607 " " WHITESPACE@606..607 " "
PATH_TYPE@607..615 PATH_TYPE@607..615