Skip to content

Commit e51188c

Browse files
lunacookieslunacookies
committed
Rename ‘foreign’ semantic token modifier to ‘library’
1 parent fa0d0bf commit e51188c

File tree

5 files changed

+20
-20
lines changed

5 files changed

+20
-20
lines changed

‎crates/ide/src/syntax_highlighting/highlight.rs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ fn highlight_def(db: &RootDatabase, krate: Option<hir::Crate>, def: Definition)
288288
let mut h = Highlight::new(HlTag::Symbol(SymbolKind::Macro));
289289

290290
if m.module(db).map(hir::Module::krate) != krate {
291-
h |= HlMod::Foreign;
291+
h |= HlMod::Library;
292292
}
293293

294294
return h;
@@ -297,7 +297,7 @@ fn highlight_def(db: &RootDatabase, krate: Option<hir::Crate>, def: Definition)
297297
let mut h = Highlight::new(HlTag::Symbol(SymbolKind::Field));
298298

299299
if Some(field.parent_def(db).module(db).krate()) != krate {
300-
h |= HlMod::Foreign;
300+
h |= HlMod::Library;
301301
}
302302

303303
return h;
@@ -307,7 +307,7 @@ fn highlight_def(db: &RootDatabase, krate: Option<hir::Crate>, def: Definition)
307307
let mut h = Highlight::new(HlTag::Symbol(SymbolKind::Module));
308308

309309
if Some(module.krate()) != krate {
310-
h |= HlMod::Foreign;
310+
h |= HlMod::Library;
311311
}
312312

313313
return h;
@@ -344,7 +344,7 @@ fn highlight_def(db: &RootDatabase, krate: Option<hir::Crate>, def: Definition)
344344
h |= HlMod::Async;
345345
}
346346
if Some(func.module(db).krate()) != krate {
347-
h |= HlMod::Foreign;
347+
h |= HlMod::Library;
348348
}
349349
return h;
350350
}
@@ -357,7 +357,7 @@ fn highlight_def(db: &RootDatabase, krate: Option<hir::Crate>, def: Definition)
357357
let mut h = Highlight::new(h);
358358

359359
if Some(adt.module(db).krate()) != krate {
360-
h |= HlMod::Foreign;
360+
h |= HlMod::Library;
361361
}
362362

363363
return h;
@@ -366,7 +366,7 @@ fn highlight_def(db: &RootDatabase, krate: Option<hir::Crate>, def: Definition)
366366
let mut h = Highlight::new(HlTag::Symbol(SymbolKind::Variant));
367367

368368
if Some(variant.module(db).krate()) != krate {
369-
h |= HlMod::Foreign;
369+
h |= HlMod::Library;
370370
}
371371

372372
return h;
@@ -389,7 +389,7 @@ fn highlight_def(db: &RootDatabase, krate: Option<hir::Crate>, def: Definition)
389389
}
390390

391391
if Some(konst.module(db).krate()) != krate {
392-
h |= HlMod::Foreign;
392+
h |= HlMod::Library;
393393
}
394394

395395
return h;
@@ -402,7 +402,7 @@ fn highlight_def(db: &RootDatabase, krate: Option<hir::Crate>, def: Definition)
402402
}
403403

404404
if Some(trait_.module(db).krate()) != krate {
405-
h |= HlMod::Foreign;
405+
h |= HlMod::Library;
406406
}
407407

408408
return h;
@@ -425,7 +425,7 @@ fn highlight_def(db: &RootDatabase, krate: Option<hir::Crate>, def: Definition)
425425
}
426426

427427
if Some(type_.module(db).krate()) != krate {
428-
h |= HlMod::Foreign;
428+
h |= HlMod::Library;
429429
}
430430

431431
return h;
@@ -440,7 +440,7 @@ fn highlight_def(db: &RootDatabase, krate: Option<hir::Crate>, def: Definition)
440440
}
441441

442442
if Some(s.module(db).krate()) != krate {
443-
h |= HlMod::Foreign;
443+
h |= HlMod::Library;
444444
}
445445

446446
return h;

‎crates/ide/src/syntax_highlighting/tags.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ pub enum HlMod {
6868
/// Used with keywords like `async` and `await`.
6969
Async,
7070
/// Used for items from other crates.
71-
Foreign,
71+
Library,
7272
// Keep this last!
7373
/// Used for unsafe functions, unsafe traits, mutable statics, union accesses and unsafe operations.
7474
Unsafe,
@@ -191,7 +191,7 @@ impl HlMod {
191191
HlMod::Static,
192192
HlMod::Trait,
193193
HlMod::Async,
194-
HlMod::Foreign,
194+
HlMod::Library,
195195
HlMod::Unsafe,
196196
];
197197

@@ -210,7 +210,7 @@ impl HlMod {
210210
HlMod::Static => "static",
211211
HlMod::Trait => "trait",
212212
HlMod::Async => "async",
213-
HlMod::Foreign => "foreign",
213+
HlMod::Library => "library",
214214
HlMod::Unsafe => "unsafe",
215215
}
216216
}

‎crates/ide/src/syntax_highlighting/test_data/highlighting.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -251,14 +251,14 @@
251251
<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>
252252

253253
<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>
254-
<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>
255-
<span class="field foreign">name</span><span class="colon">:</span> <span class="string_literal">"Bob"</span><span class="comma">,</span>
256-
<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>
254+
<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>
255+
<span class="field library">name</span><span class="colon">:</span> <span class="string_literal">"Bob"</span><span class="comma">,</span>
256+
<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>
257257
<span class="brace">}</span><span class="semicolon">;</span>
258258

259-
<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>
259+
<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>
260260

261-
<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>
261+
<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>
262262
foo::<span class="macro">die!</span><span class="parenthesis">(</span><span class="parenthesis">)</span><span class="semicolon">;</span>
263263
<span class="brace">}</span>
264264
<span class="brace">}</span>

‎crates/rust-analyzer/src/semantic_tokens.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ define_semantic_token_modifiers![
9292
(MUTABLE, "mutable"),
9393
(CONSUMING, "consuming"),
9494
(ASYNC, "async"),
95-
(FOREIGN, "foreign"),
95+
(LIBRARY, "library"),
9696
(UNSAFE, "unsafe"),
9797
(ATTRIBUTE_MODIFIER, "attribute"),
9898
(TRAIT_MODIFIER, "trait"),

‎crates/rust-analyzer/src/to_proto.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -504,7 +504,7 @@ fn semantic_token_type_and_modifiers(
504504
HlMod::Mutable => semantic_tokens::MUTABLE,
505505
HlMod::Consuming => semantic_tokens::CONSUMING,
506506
HlMod::Async => semantic_tokens::ASYNC,
507-
HlMod::Foreign => semantic_tokens::FOREIGN,
507+
HlMod::Library => semantic_tokens::LIBRARY,
508508
HlMod::Unsafe => semantic_tokens::UNSAFE,
509509
HlMod::Callable => semantic_tokens::CALLABLE,
510510
HlMod::Static => lsp_types::SemanticTokenModifier::STATIC,

0 commit comments

Comments
 (0)