aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2020-02-26 21:10:44 +0000
committerGitHub <[email protected]>2020-02-26 21:10:44 +0000
commit0e09ecb8b3197b7c3e26c879499c522aac1fcb88 (patch)
treec2300eeb89a4aef6043d5182bdb5c2c0b81d2272
parentcfc6abed9db730ed56d8158d2091d718abc34183 (diff)
parentc88ba9c4bd5b6421566509489e1ab73e87fce455 (diff)
Merge #3332
3332: Fix r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
-rw-r--r--crates/rust-analyzer/src/conv.rs2
-rw-r--r--editors/code/package.json14
2 files changed, 15 insertions, 1 deletions
diff --git a/crates/rust-analyzer/src/conv.rs b/crates/rust-analyzer/src/conv.rs
index 220e0572a..5596967bd 100644
--- a/crates/rust-analyzer/src/conv.rs
+++ b/crates/rust-analyzer/src/conv.rs
@@ -343,7 +343,7 @@ impl Conv for HighlightTag {
343 } 343 }
344 344
345 HighlightTag::LITERAL_STRING => SemanticTokenType::STRING, 345 HighlightTag::LITERAL_STRING => SemanticTokenType::STRING,
346 HighlightTag::LITERAL_ATTRIBUTE => "attribute".into(), 346 HighlightTag::LITERAL_ATTRIBUTE => SemanticTokenType::KEYWORD,
347 347
348 HighlightTag::KEYWORD => SemanticTokenType::KEYWORD, 348 HighlightTag::KEYWORD => SemanticTokenType::KEYWORD,
349 HighlightTag::KEYWORD_UNSAFE => SemanticTokenType::KEYWORD, 349 HighlightTag::KEYWORD_UNSAFE => SemanticTokenType::KEYWORD,
diff --git a/editors/code/package.json b/editors/code/package.json
index 2a89987e8..c5f9d50ac 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -379,6 +379,20 @@
379 "highContrast": "#BEBEBE" 379 "highContrast": "#BEBEBE"
380 } 380 }
381 } 381 }
382 ],
383 "semanticTokenStyleDefaults": [
384 {
385 "selector": "*.mutable",
386 "light": {
387 "fontStyle": "underline"
388 },
389 "dark": {
390 "fontStyle": "underline"
391 },
392 "highContrast": {
393 "fontStyle": "underline"
394 }
395 }
382 ] 396 ]
383 } 397 }
384} 398}