aboutsummaryrefslogtreecommitdiff
path: root/editors/code
diff options
context:
space:
mode:
authorSteffen Lyngbaek <[email protected]>2020-03-12 15:43:07 +0000
committerSteffen Lyngbaek <[email protected]>2020-03-12 15:43:07 +0000
commita153b9087520012b5f815b4df6c3657d490b30c8 (patch)
treecd3e079deee667c1f600c5a6ddb8cd4cfc67c62c /editors/code
parent58248e24cd45adcbfd7bfd00e1487df196b4a8c6 (diff)
Make maxLength nullable again
Diffstat (limited to 'editors/code')
-rw-r--r--editors/code/package.json5
-rw-r--r--editors/code/src/config.ts4
2 files changed, 6 insertions, 3 deletions
diff --git a/editors/code/package.json b/editors/code/package.json
index 296d6fe8e..78f3539e9 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -318,7 +318,10 @@
318 "description": "Whether to show function parameter name inlay hints at the call site" 318 "description": "Whether to show function parameter name inlay hints at the call site"
319 }, 319 },
320 "rust-analyzer.inlayHints.maxLength": { 320 "rust-analyzer.inlayHints.maxLength": {
321 "type": "integer", 321 "type": [
322 "null",
323 "integer"
324 ],
322 "default": 20, 325 "default": 20,
323 "minimum": 0, 326 "minimum": 0,
324 "exclusiveMinimum": true, 327 "exclusiveMinimum": true,
diff --git a/editors/code/src/config.ts b/editors/code/src/config.ts
index 2668c9640..c3b3ecabf 100644
--- a/editors/code/src/config.ts
+++ b/editors/code/src/config.ts
@@ -8,7 +8,7 @@ const RA_LSP_DEBUG = process.env.__RA_LSP_SERVER_DEBUG;
8export interface InlayHintOptions { 8export interface InlayHintOptions {
9 typeHints: boolean; 9 typeHints: boolean;
10 parameterHints: boolean; 10 parameterHints: boolean;
11 maxLength: number; 11 maxLength: number | null;
12} 12}
13 13
14export interface CargoWatchOptions { 14export interface CargoWatchOptions {
@@ -160,7 +160,7 @@ export class Config {
160 return { 160 return {
161 typeHints: this.cfg.get("inlayHints.typeHints") as boolean, 161 typeHints: this.cfg.get("inlayHints.typeHints") as boolean,
162 parameterHints: this.cfg.get("inlayHints.parameterHints") as boolean, 162 parameterHints: this.cfg.get("inlayHints.parameterHints") as boolean,
163 maxLength: this.cfg.get("inlayHints.maxLength") as number, 163 maxLength: this.cfg.get("inlayHints.maxLength") as null | number,
164 }; 164 };
165 } 165 }
166 get excludeGlobs() { return this.cfg.get("excludeGlobs") as string[]; } 166 get excludeGlobs() { return this.cfg.get("excludeGlobs") as string[]; }