itsscb/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-01 11:31:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename ‘foreign’ semantic token modifier to ‘library’

Browse Source
This commit is contained in:
Aramis Razzaghipour 2021-05-24 14:48:42 +10:00
parent fa0d0bfb7f
commit e51188cd09
No known key found for this signature in database
GPG Key ID: F788F7E990136003
5 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
crates/ide/src/syntax_highlighting/highlight.rs
View File

@ -288,7 +288,7 @@ fn highlight_def(db: &RootDatabase, krate: Option<hir::Crate>, def: Definition)
let mut h = Highlight::new(HlTag::Symbol(SymbolKind::Macro));
if m.module(db).map(hir::Module::krate) != krate {
h |= HlMod::Foreign;
h |= HlMod::Library;
}
return h;
@ -297,7 +297,7 @@ fn highlight_def(db: &RootDatabase, krate: Option<hir::Crate>, def: Definition)
let mut h = Highlight::new(HlTag::Symbol(SymbolKind::Field));
if Some(field.parent_def(db).module(db).krate()) != krate {
h |= HlMod::Foreign;
h |= HlMod::Library;
}
return h;
@ -307,7 +307,7 @@ fn highlight_def(db: &RootDatabase, krate: Option<hir::Crate>, def: Definition)
let mut h = Highlight::new(HlTag::Symbol(SymbolKind::Module));
if Some(module.krate()) != krate {
h |= HlMod::Foreign;
h |= HlMod::Library;
}
return h;
@ -344,7 +344,7 @@ fn highlight_def(db: &RootDatabase, krate: Option<hir::Crate>, def: Definition)
h |= HlMod::Async;
}
if Some(func.module(db).krate()) != krate {
h |= HlMod::Foreign;
h |= HlMod::Library;
}
return h;
}
@ -357,7 +357,7 @@ fn highlight_def(db: &RootDatabase, krate: Option<hir::Crate>, def: Definition)
let mut h = Highlight::new(h);
if Some(adt.module(db).krate()) != krate {
h |= HlMod::Foreign;
h |= HlMod::Library;
}
return h;
@ -366,7 +366,7 @@ fn highlight_def(db: &RootDatabase, krate: Option<hir::Crate>, def: Definition)
let mut h = Highlight::new(HlTag::Symbol(SymbolKind::Variant));
if Some(variant.module(db).krate()) != krate {
h |= HlMod::Foreign;
h |= HlMod::Library;
}
return h;
@ -389,7 +389,7 @@ fn highlight_def(db: &RootDatabase, krate: Option<hir::Crate>, def: Definition)
}
if Some(konst.module(db).krate()) != krate {
h |= HlMod::Foreign;
h |= HlMod::Library;
}
return h;
@ -402,7 +402,7 @@ fn highlight_def(db: &RootDatabase, krate: Option<hir::Crate>, def: Definition)
}
if Some(trait_.module(db).krate()) != krate {
h |= HlMod::Foreign;
h |= HlMod::Library;
}
return h;
@ -425,7 +425,7 @@ fn highlight_def(db: &RootDatabase, krate: Option<hir::Crate>, def: Definition)
}
if Some(type_.module(db).krate()) != krate {
h |= HlMod::Foreign;
h |= HlMod::Library;
}
return h;
@ -440,7 +440,7 @@ fn highlight_def(db: &RootDatabase, krate: Option<hir::Crate>, def: Definition)
}
if Some(s.module(db).krate()) != krate {
h |= HlMod::Foreign;
h |= HlMod::Library;
}
return h;

6
crates/ide/src/syntax_highlighting/tags.rs
View File

@ -68,7 +68,7 @@ pub enum HlMod {
/// Used with keywords like `async` and `await`.
Async,
/// Used for items from other crates.
Foreign,
Library,
// Keep this last!
/// Used for unsafe functions, unsafe traits, mutable statics, union accesses and unsafe operations.
Unsafe,
@ -191,7 +191,7 @@ impl HlMod {
HlMod::Static,
HlMod::Trait,
HlMod::Async,
HlMod::Foreign,
HlMod::Library,
HlMod::Unsafe,
];
@ -210,7 +210,7 @@ impl HlMod {
HlMod::Static => "static",
HlMod::Trait => "trait",
HlMod::Async => "async",
HlMod::Foreign => "foreign",
HlMod::Library => "library",
HlMod::Unsafe => "unsafe",
}
}

10
crates/ide/src/syntax_highlighting/test_data/highlighting.html
View File

@ -251,14 +251,14 @@ pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd
<span class="keyword">impl</span> <span class="trait unsafe">Dangerous</span> <span class="keyword">for</span> <span class="parenthesis">(</span><span class="parenthesis">)</span> <span class="brace">{</span><span class="brace">}</span>
<span class="keyword">fn</span> <span class="function declaration">use_foo_items</span><span class="parenthesis">(</span><span class="parenthesis">)</span> <span class="brace">{</span>
<span class="keyword">let</span> <span class="variable declaration">bob</span> <span class="operator">=</span> <span class="module foreign">foo</span><span class="operator">::</span><span class="struct foreign">Person</span> <span class="brace">{</span>
<span class="field foreign">name</span><span class="colon">:</span> <span class="string_literal">"Bob"</span><span class="comma">,</span>
<span class="field foreign">age</span><span class="colon">:</span> <span class="module foreign">foo</span><span class="operator">::</span><span class="module foreign">consts</span><span class="operator">::</span><span class="constant foreign">NUMBER</span><span class="comma">,</span>
<span class="keyword">let</span> <span class="variable declaration">bob</span> <span class="operator">=</span> <span class="module library">foo</span><span class="operator">::</span><span class="struct library">Person</span> <span class="brace">{</span>
<span class="field library">name</span><span class="colon">:</span> <span class="string_literal">"Bob"</span><span class="comma">,</span>
<span class="field library">age</span><span class="colon">:</span> <span class="module library">foo</span><span class="operator">::</span><span class="module library">consts</span><span class="operator">::</span><span class="constant library">NUMBER</span><span class="comma">,</span>
<span class="brace">}</span><span class="semicolon">;</span>
<span class="keyword">let</span> <span class="variable declaration">control_flow</span> <span class="operator">=</span> <span class="module foreign">foo</span><span class="operator">::</span><span class="function foreign">identity</span><span class="parenthesis">(</span><span class="module foreign">foo</span><span class="operator">::</span><span class="enum foreign">ControlFlow</span><span class="operator">::</span><span class="enum_variant foreign">Continue</span><span class="parenthesis">)</span><span class="semicolon">;</span>
<span class="keyword">let</span> <span class="variable declaration">control_flow</span> <span class="operator">=</span> <span class="module library">foo</span><span class="operator">::</span><span class="function library">identity</span><span class="parenthesis">(</span><span class="module library">foo</span><span class="operator">::</span><span class="enum library">ControlFlow</span><span class="operator">::</span><span class="enum_variant library">Continue</span><span class="parenthesis">)</span><span class="semicolon">;</span>
<span class="keyword control">if</span> <span class="keyword">let</span> <span class="module foreign">foo</span><span class="operator">::</span><span class="enum foreign">ControlFlow</span><span class="operator">::</span><span class="enum_variant foreign">Die</span> <span class="operator">=</span> <span class="variable">control_flow</span> <span class="brace">{</span>
<span class="keyword control">if</span> <span class="keyword">let</span> <span class="module library">foo</span><span class="operator">::</span><span class="enum library">ControlFlow</span><span class="operator">::</span><span class="enum_variant library">Die</span> <span class="operator">=</span> <span class="variable">control_flow</span> <span class="brace">{</span>
foo::<span class="macro">die!</span><span class="parenthesis">(</span><span class="parenthesis">)</span><span class="semicolon">;</span>
<span class="brace">}</span>
<span class="brace">}</span>

2
crates/rust-analyzer/src/semantic_tokens.rs
View File

@ -92,7 +92,7 @@ define_semantic_token_modifiers![
(MUTABLE, "mutable"),
(CONSUMING, "consuming"),
(ASYNC, "async"),
(FOREIGN, "foreign"),
(LIBRARY, "library"),
(UNSAFE, "unsafe"),
(ATTRIBUTE_MODIFIER, "attribute"),
(TRAIT_MODIFIER, "trait"),

2
crates/rust-analyzer/src/to_proto.rs
View File

@ -504,7 +504,7 @@ fn semantic_token_type_and_modifiers(
HlMod::Mutable => semantic_tokens::MUTABLE,
HlMod::Consuming => semantic_tokens::CONSUMING,
HlMod::Async => semantic_tokens::ASYNC,
HlMod::Foreign => semantic_tokens::FOREIGN,
HlMod::Library => semantic_tokens::LIBRARY,
HlMod::Unsafe => semantic_tokens::UNSAFE,
HlMod::Callable => semantic_tokens::CALLABLE,
HlMod::Static => lsp_types::SemanticTokenModifier::STATIC,