diff options
Diffstat (limited to 'editors')
-rw-r--r-- | editors/code/package.json | 289 | ||||
-rw-r--r-- | editors/code/src/inlay_hints.ts | 2 |
2 files changed, 2 insertions, 289 deletions
diff --git a/editors/code/package.json b/editors/code/package.json index 9444649f6..269bed0f8 100644 --- a/editors/code/package.json +++ b/editors/code/package.json | |||
@@ -147,68 +147,6 @@ | |||
147 | "default": false, | 147 | "default": false, |
148 | "description": "Highlight Rust code (overrides built-in syntax highlighting)" | 148 | "description": "Highlight Rust code (overrides built-in syntax highlighting)" |
149 | }, | 149 | }, |
150 | "rust-analyzer.scopeMappings": { | ||
151 | "type": "object", | ||
152 | "definitions": {}, | ||
153 | "properties": { | ||
154 | "comment": { | ||
155 | "$ref": "vscode://schemas/textmate-colors#/items/properties/scope" | ||
156 | }, | ||
157 | "string": { | ||
158 | "$ref": "vscode://schemas/textmate-colors#/items/properties/scope" | ||
159 | }, | ||
160 | "keyword": { | ||
161 | "$ref": "vscode://schemas/textmate-colors#/items/properties/scope" | ||
162 | }, | ||
163 | "keyword.control": { | ||
164 | "$ref": "vscode://schemas/textmate-colors#/items/properties/scope" | ||
165 | }, | ||
166 | "keyword.unsafe": { | ||
167 | "$ref": "vscode://schemas/textmate-colors#/items/properties/scope" | ||
168 | }, | ||
169 | "function": { | ||
170 | "$ref": "vscode://schemas/textmate-colors#/items/properties/scope" | ||
171 | }, | ||
172 | "parameter": { | ||
173 | "$ref": "vscode://schemas/textmate-colors#/items/properties/scope" | ||
174 | }, | ||
175 | "constant": { | ||
176 | "$ref": "vscode://schemas/textmate-colors#/items/properties/scope" | ||
177 | }, | ||
178 | "type": { | ||
179 | "$ref": "vscode://schemas/textmate-colors#/items/properties/scope" | ||
180 | }, | ||
181 | "builtin": { | ||
182 | "$ref": "vscode://schemas/textmate-colors#/items/properties/scope" | ||
183 | }, | ||
184 | "text": { | ||
185 | "$ref": "vscode://schemas/textmate-colors#/items/properties/scope" | ||
186 | }, | ||
187 | "attribute": { | ||
188 | "$ref": "vscode://schemas/textmate-colors#/items/properties/scope" | ||
189 | }, | ||
190 | "literal": { | ||
191 | "$ref": "vscode://schemas/textmate-colors#/items/properties/scope" | ||
192 | }, | ||
193 | "macro": { | ||
194 | "$ref": "vscode://schemas/textmate-colors#/items/properties/scope" | ||
195 | }, | ||
196 | "variable": { | ||
197 | "$ref": "vscode://schemas/textmate-colors#/items/properties/scope" | ||
198 | }, | ||
199 | "variable.mut": { | ||
200 | "$ref": "vscode://schemas/textmate-colors#/items/properties/scope" | ||
201 | }, | ||
202 | "field": { | ||
203 | "$ref": "vscode://schemas/textmate-colors#/items/properties/scope" | ||
204 | }, | ||
205 | "module": { | ||
206 | "$ref": "vscode://schemas/textmate-colors#/items/properties/scope" | ||
207 | } | ||
208 | }, | ||
209 | "additionalProperties": false, | ||
210 | "description": "Mapping Rust Analyzer scopes to TextMateRule scopes list." | ||
211 | }, | ||
212 | "rust-analyzer.rainbowHighlightingOn": { | 150 | "rust-analyzer.rainbowHighlightingOn": { |
213 | "type": "boolean", | 151 | "type": "boolean", |
214 | "default": false, | 152 | "default": false, |
@@ -374,232 +312,7 @@ | |||
374 | ], | 312 | ], |
375 | "colors": [ | 313 | "colors": [ |
376 | { | 314 | { |
377 | "id": "ralsp.comment", | 315 | "id": "rust-analyzer.inlayHint", |
378 | "description": "Color for comments", | ||
379 | "defaults": { | ||
380 | "dark": "#6A9955", | ||
381 | "light": "#008000", | ||
382 | "highContrast": "#7CA668" | ||
383 | } | ||
384 | }, | ||
385 | { | ||
386 | "id": "ralsp.string", | ||
387 | "description": "Color for strings", | ||
388 | "defaults": { | ||
389 | "dark": "#CE9178", | ||
390 | "light": "#A31515", | ||
391 | "highContrast": "#CE9178" | ||
392 | } | ||
393 | }, | ||
394 | { | ||
395 | "id": "ralsp.keyword", | ||
396 | "description": "Color for keywords", | ||
397 | "defaults": { | ||
398 | "dark": "#569cd6", | ||
399 | "light": "#0000FF", | ||
400 | "highContrast": "#569CD6" | ||
401 | } | ||
402 | }, | ||
403 | { | ||
404 | "id": "ralsp.keyword.control", | ||
405 | "description": "Color for control keywords", | ||
406 | "defaults": { | ||
407 | "dark": "#C586C0", | ||
408 | "light": "#AF00DB", | ||
409 | "highContrast": "#C586C0" | ||
410 | } | ||
411 | }, | ||
412 | { | ||
413 | "id": "ralsp.keyword.unsafe", | ||
414 | "description": "Color for unsafe", | ||
415 | "defaults": { | ||
416 | "dark": "#FF3030", | ||
417 | "light": "#FF1010", | ||
418 | "highContrast": "#FF1010" | ||
419 | } | ||
420 | }, | ||
421 | { | ||
422 | "id": "ralsp.function", | ||
423 | "description": "Color for functions", | ||
424 | "defaults": { | ||
425 | "dark": "#DCDCAA", | ||
426 | "light": "#795E26", | ||
427 | "highContrast": "#DCDCAA" | ||
428 | } | ||
429 | }, | ||
430 | { | ||
431 | "id": "ralsp.parameter", | ||
432 | "description": "Color for parameters", | ||
433 | "defaults": { | ||
434 | "dark": "#9CDCFE", | ||
435 | "light": "#001080", | ||
436 | "highContrast": "#9CDCFE" | ||
437 | } | ||
438 | }, | ||
439 | { | ||
440 | "id": "ralsp.builtin", | ||
441 | "description": "Color for builtins", | ||
442 | "defaults": { | ||
443 | "dark": "#DD6718", | ||
444 | "light": "#DD6718", | ||
445 | "highContrast": "#DD6718" | ||
446 | } | ||
447 | }, | ||
448 | { | ||
449 | "id": "ralsp.text", | ||
450 | "description": "Color for text", | ||
451 | "defaults": { | ||
452 | "dark": "#D4D4D4", | ||
453 | "light": "#000000", | ||
454 | "highContrast": "#FFFFFF" | ||
455 | } | ||
456 | }, | ||
457 | { | ||
458 | "id": "ralsp.attribute", | ||
459 | "description": "Color for attributes", | ||
460 | "defaults": { | ||
461 | "dark": "#9FE9BF", | ||
462 | "light": "#1F4B1F", | ||
463 | "highContrast": "#108010" | ||
464 | } | ||
465 | }, | ||
466 | { | ||
467 | "id": "ralsp.literal", | ||
468 | "description": "Color for literals", | ||
469 | "defaults": { | ||
470 | "dark": "#BECEA8", | ||
471 | "light": "#09885A", | ||
472 | "highContrast": "#B5CEA8" | ||
473 | } | ||
474 | }, | ||
475 | { | ||
476 | "id": "ralsp.literal.numeric", | ||
477 | "description": "Color for numeric literals", | ||
478 | "defaults": { | ||
479 | "dark": "#BECEA8", | ||
480 | "light": "#09885A", | ||
481 | "highContrast": "#B5CEA8" | ||
482 | } | ||
483 | }, | ||
484 | { | ||
485 | "id": "ralsp.literal.char", | ||
486 | "description": "Color for character literals", | ||
487 | "defaults": { | ||
488 | "dark": "#BECEA8", | ||
489 | "light": "#09885A", | ||
490 | "highContrast": "#B5CEA8" | ||
491 | } | ||
492 | }, | ||
493 | { | ||
494 | "id": "ralsp.literal.byte", | ||
495 | "description": "Color for byte literals", | ||
496 | "defaults": { | ||
497 | "dark": "#BECEA8", | ||
498 | "light": "#09885A", | ||
499 | "highContrast": "#B5CEA8" | ||
500 | } | ||
501 | }, | ||
502 | { | ||
503 | "id": "ralsp.macro", | ||
504 | "description": "Color for macros", | ||
505 | "defaults": { | ||
506 | "dark": "#BFEBBF", | ||
507 | "light": "#DD6718", | ||
508 | "highContrast": "#ED7718" | ||
509 | } | ||
510 | }, | ||
511 | { | ||
512 | "id": "ralsp.constant", | ||
513 | "description": "Color for constants", | ||
514 | "defaults": { | ||
515 | "dark": "#569cd6", | ||
516 | "light": "#267cb6", | ||
517 | "highContrast": "#569cd6" | ||
518 | } | ||
519 | }, | ||
520 | { | ||
521 | "id": "ralsp.type", | ||
522 | "description": "Color for other types (traits, aliases..)", | ||
523 | "defaults": { | ||
524 | "dark": "#4EC9B0", | ||
525 | "light": "#267F99", | ||
526 | "highContrast": "#4EC9B0" | ||
527 | } | ||
528 | }, | ||
529 | { | ||
530 | "id": "ralsp.type.builtin", | ||
531 | "description": "Color for built-in types (&str, bool, u16, u32)", | ||
532 | "defaults": { | ||
533 | "dark": "#4EC9B0", | ||
534 | "light": "#267F99", | ||
535 | "highContrast": "#4EC9B0" | ||
536 | } | ||
537 | }, | ||
538 | { | ||
539 | "id": "ralsp.type.lifetime", | ||
540 | "description": "Color for lifetimes parameters", | ||
541 | "defaults": { | ||
542 | "dark": "#4EC9B0", | ||
543 | "light": "#267F99", | ||
544 | "highContrast": "#4EC9B0" | ||
545 | } | ||
546 | }, | ||
547 | { | ||
548 | "id": "ralsp.type.self", | ||
549 | "description": "Color for `Self` param type", | ||
550 | "defaults": { | ||
551 | "dark": "#4EC9B0", | ||
552 | "light": "#267F99", | ||
553 | "highContrast": "#4EC9B0" | ||
554 | } | ||
555 | }, | ||
556 | { | ||
557 | "id": "ralsp.type.param", | ||
558 | "description": "Color for type parameters", | ||
559 | "defaults": { | ||
560 | "dark": "#4EC9B0", | ||
561 | "light": "#267F99", | ||
562 | "highContrast": "#4EC9B0" | ||
563 | } | ||
564 | }, | ||
565 | { | ||
566 | "id": "ralsp.field", | ||
567 | "description": "Color for fields", | ||
568 | "defaults": { | ||
569 | "dark": "#4EC9B0", | ||
570 | "light": "#267F99", | ||
571 | "highContrast": "#4EC9B0" | ||
572 | } | ||
573 | }, | ||
574 | { | ||
575 | "id": "ralsp.variable", | ||
576 | "description": "Color for variables", | ||
577 | "defaults": { | ||
578 | "dark": "#4EC9B0", | ||
579 | "light": "#267F99", | ||
580 | "highContrast": "#4EC9B0" | ||
581 | } | ||
582 | }, | ||
583 | { | ||
584 | "id": "ralsp.variable.mut", | ||
585 | "description": "Color for mutable variables", | ||
586 | "defaults": { | ||
587 | "dark": "#4EC9B0", | ||
588 | "light": "#267F99", | ||
589 | "highContrast": "#4EC9B0" | ||
590 | } | ||
591 | }, | ||
592 | { | ||
593 | "id": "ralsp.module", | ||
594 | "description": "Color for modules", | ||
595 | "defaults": { | ||
596 | "dark": "#D4D4D4", | ||
597 | "light": "#000000", | ||
598 | "highContrast": "#FFFFFF" | ||
599 | } | ||
600 | }, | ||
601 | { | ||
602 | "id": "ralsp.inlayHint", | ||
603 | "description": "Color for inlay hints", | 316 | "description": "Color for inlay hints", |
604 | "defaults": { | 317 | "defaults": { |
605 | "dark": "#A0A0A0F0", | 318 | "dark": "#A0A0A0F0", |
diff --git a/editors/code/src/inlay_hints.ts b/editors/code/src/inlay_hints.ts index a7be97db8..7575cead0 100644 --- a/editors/code/src/inlay_hints.ts +++ b/editors/code/src/inlay_hints.ts | |||
@@ -36,7 +36,7 @@ interface InlayHint { | |||
36 | 36 | ||
37 | const typeHintDecorationType = vscode.window.createTextEditorDecorationType({ | 37 | const typeHintDecorationType = vscode.window.createTextEditorDecorationType({ |
38 | after: { | 38 | after: { |
39 | color: new vscode.ThemeColor('ralsp.inlayHint'), | 39 | color: new vscode.ThemeColor('rust-analyzer.inlayHint'), |
40 | }, | 40 | }, |
41 | }); | 41 | }); |
42 | 42 | ||