Skip to content

Commit 84485a8

Browse files
committed
Delete library modifier to highlighting for extern crate
1 parent 21b0c22 commit 84485a8

File tree

2 files changed

+7
-24
lines changed

2 files changed

+7
-24
lines changed

src/tools/rust-analyzer/crates/ide/src/syntax_highlighting/highlight.rs

+1-18
Original file line numberDiff line numberDiff line change
@@ -703,24 +703,7 @@ fn highlight_name_ref_by_syntax(
703703
};
704704

705705
match parent.kind() {
706-
EXTERN_CRATE => {
707-
let mut h: Highlight = HlTag::Symbol(SymbolKind::Module).into();
708-
let is_crate_root = if let Some(extern_crate) = ast::ExternCrate::cast(parent.clone()) {
709-
if let Some(first_segment) = extern_crate.name_ref() {
710-
first_segment.syntax().text() == name.syntax().text()
711-
} else {
712-
false
713-
}
714-
} else {
715-
false
716-
};
717-
718-
if is_crate_root {
719-
h |= HlMod::CrateRoot;
720-
}
721-
722-
h | HlMod::Library
723-
}
706+
EXTERN_CRATE => (HlTag::Symbol(SymbolKind::Module) | HlMod::CrateRoot).into(),
724707
METHOD_CALL_EXPR => ast::MethodCallExpr::cast(parent)
725708
.and_then(|it| highlight_method_call(sema, krate, &it, edition))
726709
.unwrap_or_else(|| SymbolKind::Method.into()),

src/tools/rust-analyzer/crates/ide/src/syntax_highlighting/test_data/highlight_doctest.html

+6-6
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,12 @@
5252

5353
<span class="comment documentation">//! ```rust</span>
5454
<span class="comment documentation">//!</span><span class="comment documentation"> </span><span class="keyword injected">extern</span><span class="none injected"> </span><span class="keyword injected">crate</span><span class="none injected"> </span><span class="self_keyword crate_root injected">self</span><span class="semicolon injected">;</span>
55-
<span class="comment documentation">//!</span><span class="comment documentation"> </span><span class="keyword injected">extern</span><span class="none injected"> </span><span class="keyword injected">crate</span><span class="none injected"> </span><span class="module crate_root injected library">std</span><span class="semicolon injected">;</span>
56-
<span class="comment documentation">//!</span><span class="comment documentation"> </span><span class="keyword injected">extern</span><span class="none injected"> </span><span class="keyword injected">crate</span><span class="none injected"> </span><span class="module crate_root injected library">core</span><span class="semicolon injected">;</span>
57-
<span class="comment documentation">//!</span><span class="comment documentation"> </span><span class="keyword injected">extern</span><span class="none injected"> </span><span class="keyword injected">crate</span><span class="none injected"> </span><span class="module crate_root injected library">alloc</span><span class="semicolon injected">;</span>
58-
<span class="comment documentation">//!</span><span class="comment documentation"> </span><span class="keyword injected">extern</span><span class="none injected"> </span><span class="keyword injected">crate</span><span class="none injected"> </span><span class="module crate_root injected library">proc_macro</span><span class="semicolon injected">;</span>
59-
<span class="comment documentation">//!</span><span class="comment documentation"> </span><span class="keyword injected">extern</span><span class="none injected"> </span><span class="keyword injected">crate</span><span class="none injected"> </span><span class="module crate_root injected library">test</span><span class="semicolon injected">;</span>
60-
<span class="comment documentation">//!</span><span class="comment documentation"> </span><span class="keyword injected">extern</span><span class="none injected"> </span><span class="keyword injected">crate</span><span class="none injected"> </span><span class="module crate_root injected library">Krate</span><span class="semicolon injected">;</span>
55+
<span class="comment documentation">//!</span><span class="comment documentation"> </span><span class="keyword injected">extern</span><span class="none injected"> </span><span class="keyword injected">crate</span><span class="none injected"> </span><span class="module crate_root injected">std</span><span class="semicolon injected">;</span>
56+
<span class="comment documentation">//!</span><span class="comment documentation"> </span><span class="keyword injected">extern</span><span class="none injected"> </span><span class="keyword injected">crate</span><span class="none injected"> </span><span class="module crate_root injected">core</span><span class="semicolon injected">;</span>
57+
<span class="comment documentation">//!</span><span class="comment documentation"> </span><span class="keyword injected">extern</span><span class="none injected"> </span><span class="keyword injected">crate</span><span class="none injected"> </span><span class="module crate_root injected">alloc</span><span class="semicolon injected">;</span>
58+
<span class="comment documentation">//!</span><span class="comment documentation"> </span><span class="keyword injected">extern</span><span class="none injected"> </span><span class="keyword injected">crate</span><span class="none injected"> </span><span class="module crate_root injected">proc_macro</span><span class="semicolon injected">;</span>
59+
<span class="comment documentation">//!</span><span class="comment documentation"> </span><span class="keyword injected">extern</span><span class="none injected"> </span><span class="keyword injected">crate</span><span class="none injected"> </span><span class="module crate_root injected">test</span><span class="semicolon injected">;</span>
60+
<span class="comment documentation">//!</span><span class="comment documentation"> </span><span class="keyword injected">extern</span><span class="none injected"> </span><span class="keyword injected">crate</span><span class="none injected"> </span><span class="module crate_root injected">Krate</span><span class="semicolon injected">;</span>
6161
<span class="comment documentation">//! ```</span>
6262
<span class="keyword">mod</span> <span class="module declaration">outline_module</span><span class="semicolon">;</span>
6363

0 commit comments

Comments
 (0)