Skip to content
This repository was archived by the owner on Nov 18, 2022. It is now read-only.

Commit 3676797

Browse files
committed
Validate also custom rust-client.channel values, e.g. 1.39.0
1 parent 25e60d4 commit 3676797

File tree

2 files changed

+21
-10
lines changed

2 files changed

+21
-10
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
### Unreleased
22

3+
* Don't warn on custom `rust-client.channel` value such as `1.39.0` in properties.json
34
* Add a new `default` value for `rust-client.channel` (same as setting it explicitly to `null`)
45
* Add a self-closing angular (`>`) bracket whenever opening one (`<`) has been typed
56
* Refresh the RLS spinner 🌕

package.json

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -193,17 +193,27 @@
193193
"description": "Disable usage of rustup and use rustc/rls from PATH."
194194
},
195195
"rust-client.channel": {
196-
"type": [
197-
"string",
198-
"null"
196+
"anyOf": [
197+
{
198+
"type": "string"
199+
},
200+
{
201+
"type": "string",
202+
"enum": [
203+
"default",
204+
"stable",
205+
"beta",
206+
"nightly"
207+
],
208+
"enumDescriptions": [
209+
"Uses the same channel as your currently open project",
210+
"Explicitly use the `stable` channel",
211+
"Explicitly use the `beta` channel",
212+
"Explicitly use the `nightly` channel"
213+
]
214+
}
199215
],
200-
"enum": [
201-
"default",
202-
"stable",
203-
"beta",
204-
"nightly"
205-
],
206-
"default": null,
216+
"default": "default",
207217
"description": "Rust channel to invoke rustup with. Ignored if rustup is disabled. By default, uses the same channel as your currently open project."
208218
},
209219
"rust-client.trace.server": {

0 commit comments

Comments
 (0)