language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-28 12:54:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Highlight primitive types

Browse source
This commit is contained in:
Laurențiu Nicola 2019-05-29 20:48:09 +03:00
parent cb21a21998
commit b1e59cb095
2 changed files with 55 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

8
crates/ra_ide_api/src/snapshots/highlighting.html
View file

@ -19,13 +19,13 @@ pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padding: 0.4e
</style> </style>
<pre><code><span class="attribute">#</span><span class="attribute">[</span><span class="attribute">derive</span><span class="attribute">(</span><span class="attribute">Clone</span><span class="attribute">,</span><span class="attribute"> </span><span class="attribute">Debug</span><span class="attribute">)</span><span class="attribute">]</span> <pre><code><span class="attribute">#</span><span class="attribute">[</span><span class="attribute">derive</span><span class="attribute">(</span><span class="attribute">Clone</span><span class="attribute">,</span><span class="attribute"> </span><span class="attribute">Debug</span><span class="attribute">)</span><span class="attribute">]</span>
<span class="keyword">struct</span> <span class="type">Foo</span> { <span class="keyword">struct</span> <span class="type">Foo</span> {
<span class="keyword">pub</span> <span class="function">x</span>: <span class="text">i32</span>, <span class="keyword">pub</span> <span class="function">x</span>: <span class="type">i32</span>,
<span class="keyword">pub</span> <span class="function">y</span>: <span class="text">i32</span>, <span class="keyword">pub</span> <span class="function">y</span>: <span class="type">i32</span>,
} }
<span class="keyword">fn</span> <span class="function">foo</span>&lt;<span class="type type">T</span>&gt;() -&gt; <span class="type">T</span> { <span class="keyword">fn</span> <span class="function">foo</span>&lt;<span class="type">T</span>&gt;() -&gt; <span class="type">T</span> {
<span class="macro">unimplemented</span><span class="macro">!</span>(); <span class="macro">unimplemented</span><span class="macro">!</span>();
<span class="function">foo</span>::&lt;<span class="type text">i32</span>&gt;(); <span class="function">foo</span>::&lt;<span class="type">i32</span>&gt;();
} }
<span class="comment">// comment</span> <span class="comment">// comment</span>

17
crates/ra_ide_api/src/syntax_highlighting.rs
View file

@ -30,6 +30,14 @@ fn is_control_keyword(kind: SyntaxKind) -> bool {
} }
} }
fn is_prim_type(node: &ast::NameRef) -> bool {
match node.text().as_str() {
"u8" | "i8" | "u16" | "i16" | "u32" | "i32" | "u64" | "i64" | "u128" | "i128" | "usize"
| "isize" | "f32" | "f64" | "bool" | "char" | "str" => true,
_ => false,
}
}
pub(crate) fn highlight(db: &RootDatabase, file_id: FileId) -> Vec<HighlightedRange> { pub(crate) fn highlight(db: &RootDatabase, file_id: FileId) -> Vec<HighlightedRange> {
let _p = profile("highlight"); let _p = profile("highlight");
let source_file = db.parse(file_id).tree; let source_file = db.parse(file_id).tree;
@ -62,11 +70,16 @@ pub(crate) fn highlight(db: &RootDatabase, file_id: FileId) -> Vec<HighlightedRa
ATTR => "attribute", ATTR => "attribute",
NAME_REF => { NAME_REF => {
if let Some(name_ref) = node.as_node().and_then(ast::NameRef::cast) { if let Some(name_ref) = node.as_node().and_then(ast::NameRef::cast) {
// FIXME: revisit this after #1340
if is_prim_type(name_ref) {
"type"
} else {
use crate::name_ref_kind::{classify_name_ref, NameRefKind::*}; use crate::name_ref_kind::{classify_name_ref, NameRefKind::*};
use hir::{ModuleDef, ImplItem}; use hir::{ModuleDef, ImplItem};
// FIXME: try to reuse the SourceAnalyzers // FIXME: try to reuse the SourceAnalyzers
let analyzer = hir::SourceAnalyzer::new(db, file_id, name_ref.syntax(), None); let analyzer =
hir::SourceAnalyzer::new(db, file_id, name_ref.syntax(), None);
match classify_name_ref(db, &analyzer, name_ref) { match classify_name_ref(db, &analyzer, name_ref) {
Some(Method(_)) => "function", Some(Method(_)) => "function",
Some(Macro(_)) => "macro", Some(Macro(_)) => "macro",
@ -103,6 +116,7 @@ pub(crate) fn highlight(db: &RootDatabase, file_id: FileId) -> Vec<HighlightedRa
Some(GenericParam(_)) => "type", Some(GenericParam(_)) => "type",
None => "text", None => "text",
} }
}
} else { } else {
"text" "text"
} }
@ -138,7 +152,6 @@ pub(crate) fn highlight(db: &RootDatabase, file_id: FileId) -> Vec<HighlightedRa
"text" "text"
} }
} }
TYPE_ALIAS_DEF | TYPE_ARG | TYPE_PARAM => "type",
INT_NUMBER | FLOAT_NUMBER | CHAR | BYTE => "literal", INT_NUMBER | FLOAT_NUMBER | CHAR | BYTE => "literal",
LIFETIME => "parameter", LIFETIME => "parameter",
T![unsafe] => "keyword.unsafe", T![unsafe] => "keyword.unsafe",