aboutsummaryrefslogtreecommitdiff
path: root/editors/code
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2020-02-28 13:48:42 +0000
committerGitHub <[email protected]>2020-02-28 13:48:42 +0000
commit2995fd2c87bba98d4cb7957a182a58bee68d86ba (patch)
tree9c8a33d167dbea0ffd0cb1460914542746905cad /editors/code
parent7e5cfcd4fb708f5d20a244ef010eaf57c055310d (diff)
parent9464ca97c90dca4cad57d29cac4fccdd99235925 (diff)
Merge #3363
3363: Cleanup highlighting tags r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'editors/code')
-rw-r--r--editors/code/package.json84
1 files changed, 64 insertions, 20 deletions
diff --git a/editors/code/package.json b/editors/code/package.json
index 6fc123ac0..b013c3f4a 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -400,24 +400,42 @@
400 ], 400 ],
401 "semanticTokenTypes": [ 401 "semanticTokenTypes": [
402 { 402 {
403 "id": "attribute" 403 "id": "attribute",
404 "description": "Style for attributes"
404 }, 405 },
405 { 406 {
406 "id": "constant" 407 "id": "builtinType",
408 "description": "Style for builtin types"
409 },
410 {
411 "id": "lifetime",
412 "description": "Style for lifetimes"
413 },
414 {
415 "id": "typeAlias",
416 "description": "Style for type aliases"
417 },
418 {
419 "id": "union",
420 "description": "Style for C-style untagged unions"
407 } 421 }
408 ], 422 ],
409 "semanticTokenModifiers": [ 423 "semanticTokenModifiers": [
410 { 424 {
411 "id": "mutable" 425 "id": "constant",
426 "description": "Style for compile-time constants"
412 }, 427 },
413 { 428 {
414 "id": "unsafe" 429 "id": "control",
430 "description": "Style for control flow keywords"
415 }, 431 },
416 { 432 {
417 "id": "control" 433 "id": "mutable",
434 "description": "Style for mutable bindings"
418 }, 435 },
419 { 436 {
420 "id": "builtin" 437 "id": "unsafe",
438 "description": "Style for unsafe operations"
421 } 439 }
422 ], 440 ],
423 "semanticTokenStyleDefaults": [ 441 "semanticTokenStyleDefaults": [
@@ -428,21 +446,29 @@
428 ] 446 ]
429 }, 447 },
430 { 448 {
431 "selector": "*.mutable", 449 "selector": "builtinType",
432 "light": { 450 "scope": [
433 "fontStyle": "underline" 451 "support.type.primitive"
434 }, 452 ]
435 "dark": {
436 "fontStyle": "underline"
437 },
438 "highContrast": {
439 "fontStyle": "underline"
440 }
441 }, 453 },
442 { 454 {
443 "selector": "constant", 455 "selector": "lifetime",
444 "scope": [ 456 "scope": [
445 "entity.name.constant" 457 "entity.name.lifetime.rust"
458 ]
459 },
460 {
461 "selector": "typeAlias",
462 "scope": [
463 "entity.name.type",
464 "entity.name.typeAlias"
465 ]
466 },
467 {
468 "selector": "union",
469 "scope": [
470 "entity.name.type",
471 "entity.name.union"
446 ] 472 ]
447 }, 473 },
448 { 474 {
@@ -452,10 +478,28 @@
452 ] 478 ]
453 }, 479 },
454 { 480 {
455 "selector": "type.builtin", 481 "selector": "keyword.control",
456 "scope": [ 482 "scope": [
457 "support.type.builtin" 483 "keyword.control"
458 ] 484 ]
485 },
486 {
487 "selector": "variable.constant",
488 "scope": [
489 "entity.name.constant"
490 ]
491 },
492 {
493 "selector": "*.mutable",
494 "light": {
495 "fontStyle": "underline"
496 },
497 "dark": {
498 "fontStyle": "underline"
499 },
500 "highContrast": {
501 "fontStyle": "underline"
502 }
459 } 503 }
460 ] 504 ]
461 } 505 }