diff --git a/docs/user/manual.adoc b/docs/user/manual.adoc index 84dc6552484..27f10da1032 100644 --- a/docs/user/manual.adoc +++ b/docs/user/manual.adoc @@ -722,7 +722,7 @@ Just add this to your `settings.json`: { "editor.inlayHints.fontFamily": "Courier New", "editor.inlayHints.fontSize": 11, - + "workbench.colorCustomizations": { // Name of the theme you are currently using "[Default Dark+]": { @@ -797,8 +797,8 @@ For example: [source,json] ---- { - "key": "ctrl+i", - "command": "rust-analyzer.toggleInlayHints", + "key": "ctrl+alt+d", + "command": "rust-analyzer.openDocs", "when": "inRustProject" } ---- diff --git a/editors/code/src/commands.ts b/editors/code/src/commands.ts index 4b2ac448018..18f5b3aa101 100644 --- a/editors/code/src/commands.ts +++ b/editors/code/src/commands.ts @@ -298,12 +298,12 @@ export function serverVersion(ctx: Ctx): Cmd { }; } -export function toggleInlayHints(ctx: Ctx): Cmd { +export function toggleInlayHints(_ctx: Ctx): Cmd { return async () => { - await vscode - .workspace - .getConfiguration(`${ctx.config.rootSection}.inlayHints`) - .update('enable', !ctx.config.inlayHints.enable, vscode.ConfigurationTarget.Global); + const scope = vscode.ConfigurationTarget.Global; + const config = vscode.workspace.getConfiguration("editor.inlayHints"); + const value = !config.get("enabled"); + await config.update('enabled', value, scope); }; } diff --git a/editors/code/src/config.ts b/editors/code/src/config.ts index 5d3ef404594..183521c10c5 100644 --- a/editors/code/src/config.ts +++ b/editors/code/src/config.ts @@ -97,19 +97,6 @@ export class Config { get serverExtraEnv() { return this.get("server.extraEnv") ?? {}; } get traceExtension() { return this.get("trace.extension"); } - get inlayHints() { - return { - enable: this.get("inlayHints.enable"), - typeHints: this.get("inlayHints.typeHints"), - parameterHints: this.get("inlayHints.parameterHints"), - chainingHints: this.get("inlayHints.chainingHints"), - closureReturnTypeHints: this.get("inlayHints.closureReturnTypeHints"), - hideNamedConstructorHints: this.get("inlayHints.hideNamedConstructorHints"), - smallerHints: this.get("inlayHints.smallerHints"), - maxLength: this.get("inlayHints.maxLength"), - }; - } - get cargoRunner() { return this.get("cargoRunner"); }