aboutsummaryrefslogtreecommitdiff
path: root/editors/code
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2021-04-28 11:13:52 +0100
committerGitHub <[email protected]>2021-04-28 11:13:52 +0100
commit49b219b1035e20143818d409404b5e6f19a7ad1d (patch)
tree9e8594b1d76b943a6eb287937db53e87e7f3a956 /editors/code
parentfb45d2adeccfc6732b702cd8fa2911b385bc15b7 (diff)
parent5c1a90103528dd3a93d3d8a2186276e9ebd0d400 (diff)
Merge #8683
8683: internal: ensure that client and server-side configs are not mixed up r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'editors/code')
-rw-r--r--editors/code/package.json12
1 files changed, 6 insertions, 6 deletions
diff --git a/editors/code/package.json b/editors/code/package.json
index 35b50e669..67e10df7e 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -283,6 +283,11 @@
283 "default": true, 283 "default": true,
284 "description": "Whether to show inlay hints." 284 "description": "Whether to show inlay hints."
285 }, 285 },
286 "rust-analyzer.inlayHints.smallerHints": {
287 "type": "boolean",
288 "default": true,
289 "description": "Whether inlay hints font size should be smaller than editor's font size."
290 },
286 "rust-analyzer.updates.channel": { 291 "rust-analyzer.updates.channel": {
287 "type": "string", 292 "type": "string",
288 "enum": [ 293 "enum": [
@@ -353,7 +358,7 @@
353 "Use [MS C++ tools](https://marketplace.visualstudio.com/items?itemName=ms-vscode.cpptools)" 358 "Use [MS C++ tools](https://marketplace.visualstudio.com/items?itemName=ms-vscode.cpptools)"
354 ] 359 ]
355 }, 360 },
356 "rust-analyzer.debug.sourceFileMap": { 361 "rust-analyzer.debug.sourceFileMap": {
357 "type": ["object", "string"], 362 "type": ["object", "string"],
358 "const": "auto", 363 "const": "auto",
359 "description": "Optional source file mappings passed to the debug engine.", 364 "description": "Optional source file mappings passed to the debug engine.",
@@ -654,11 +659,6 @@
654 "default": true, 659 "default": true,
655 "type": "boolean" 660 "type": "boolean"
656 }, 661 },
657 "rust-analyzer.inlayHints.smallerHints": {
658 "markdownDescription": "Whether inlay hints font size should be smaller than editor's font size.",
659 "default": true,
660 "type": "boolean"
661 },
662 "rust-analyzer.lens.debug": { 662 "rust-analyzer.lens.debug": {
663 "markdownDescription": "Whether to show `Debug` lens. Only applies when\n`#rust-analyzer.lens.enable#` is set.", 663 "markdownDescription": "Whether to show `Debug` lens. Only applies when\n`#rust-analyzer.lens.enable#` is set.",
664 "default": true, 664 "default": true,