diff --git a/crates/rust-analyzer/src/config.rs b/crates/rust-analyzer/src/config.rs index c7158648d86..150cc21a17b 100644 --- a/crates/rust-analyzer/src/config.rs +++ b/crates/rust-analyzer/src/config.rs @@ -221,21 +221,21 @@ config_data! { highlightRelated_yieldPoints_enable: bool = "true", /// Whether to show `Debug` action. Only applies when - /// `#rust-analyzer.hoverActions.enable#` is set. + /// `#rust-analyzer.hover.actions.enable#` is set. hover_actions_debug_enable: bool = "true", /// Whether to show HoverActions in Rust files. hover_actions_enable: bool = "true", /// Whether to show `Go to Type Definition` action. Only applies when - /// `#rust-analyzer.hoverActions.enable#` is set. + /// `#rust-analyzer.hover.actions.enable#` is set. hover_actions_gotoTypeDef_enable: bool = "true", /// Whether to show `Implementations` action. Only applies when - /// `#rust-analyzer.hoverActions.enable#` is set. + /// `#rust-analyzer.hover.actions.enable#` is set. hover_actions_implementations_enable: bool = "true", /// Whether to show `References` action. Only applies when - /// `#rust-analyzer.hoverActions.enable#` is set. + /// `#rust-analyzer.hover.actions.enable#` is set. hover_actions_references_enable: bool = "false", /// Whether to show `Run` action. Only applies when - /// `#rust-analyzer.hoverActions.enable#` is set. + /// `#rust-analyzer.hover.actions.enable#` is set. hover_actions_run_enable: bool = "true", /// Whether to show documentation on hover. diff --git a/crates/rust-analyzer/src/config/patch_old_style.rs b/crates/rust-analyzer/src/config/patch_old_style.rs index 05c2bb537f8..e21298e22cb 100644 --- a/crates/rust-analyzer/src/config/patch_old_style.rs +++ b/crates/rust-analyzer/src/config/patch_old_style.rs @@ -50,12 +50,12 @@ pub(super) fn patch_json_for_outdated_configs(json: &mut Value) { hover.documentation -> hover.documentation.enable; hover.linksInHover -> hover.links.enable; hoverActions.linksInHover -> hover.links.enable; - hoverActions.debug -> hoverActions.debug.enable; - hoverActions.enable -> hoverActions.enable; - hoverActions.gotoTypeDef -> hoverActions.gotoTypeDef.enable; - hoverActions.implementations -> hoverActions.implementations.enable; - hoverActions.references -> hoverActions.references.enable; - hoverActions.run -> hoverActions.run.enable; + hoverActions.debug -> hover.actions.debug.enable; + hoverActions.enable -> hover.actions.enable; + hoverActions.gotoTypeDef -> hover.actions.gotoTypeDef.enable; + hoverActions.implementations -> hover.actions.implementations.enable; + hoverActions.references -> hover.actions.references.enable; + hoverActions.run -> hover.actions.run.enable; inlayHints.chainingHints -> inlayHints.chainingHints.enable; inlayHints.closureReturnTypeHints -> inlayHints.closureReturnTypeHints.enable; inlayHints.hideNamedConstructorHints -> inlayHints.typeHints.hideNamedConstructorHints; diff --git a/docs/user/generated_config.adoc b/docs/user/generated_config.adoc index c6fa55c05b3..35e0a4082eb 100644 --- a/docs/user/generated_config.adoc +++ b/docs/user/generated_config.adoc @@ -278,7 +278,7 @@ Enables highlighting of all break points for a loop or block context while the c + -- Whether to show `Debug` action. Only applies when -`#rust-analyzer.hoverActions.enable#` is set. +`#rust-analyzer.hover.actions.enable#` is set. -- [[rust-analyzer.hover.actions.enable]]rust-analyzer.hover.actions.enable (default: `true`):: + @@ -289,25 +289,25 @@ Whether to show HoverActions in Rust files. + -- Whether to show `Go to Type Definition` action. Only applies when -`#rust-analyzer.hoverActions.enable#` is set. +`#rust-analyzer.hover.actions.enable#` is set. -- [[rust-analyzer.hover.actions.implementations.enable]]rust-analyzer.hover.actions.implementations.enable (default: `true`):: + -- Whether to show `Implementations` action. Only applies when -`#rust-analyzer.hoverActions.enable#` is set. +`#rust-analyzer.hover.actions.enable#` is set. -- [[rust-analyzer.hover.actions.references.enable]]rust-analyzer.hover.actions.references.enable (default: `false`):: + -- Whether to show `References` action. Only applies when -`#rust-analyzer.hoverActions.enable#` is set. +`#rust-analyzer.hover.actions.enable#` is set. -- [[rust-analyzer.hover.actions.run.enable]]rust-analyzer.hover.actions.run.enable (default: `true`):: + -- Whether to show `Run` action. Only applies when -`#rust-analyzer.hoverActions.enable#` is set. +`#rust-analyzer.hover.actions.enable#` is set. -- [[rust-analyzer.hover.documentation.enable]]rust-analyzer.hover.documentation.enable (default: `true`):: + diff --git a/editors/code/package.json b/editors/code/package.json index d21d1139d30..62b0f3c0baf 100644 --- a/editors/code/package.json +++ b/editors/code/package.json @@ -698,7 +698,7 @@ "type": "boolean" }, "rust-analyzer.hover.actions.debug.enable": { - "markdownDescription": "Whether to show `Debug` action. Only applies when\n`#rust-analyzer.hoverActions.enable#` is set.", + "markdownDescription": "Whether to show `Debug` action. Only applies when\n`#rust-analyzer.hover.actions.enable#` is set.", "default": true, "type": "boolean" }, @@ -708,22 +708,22 @@ "type": "boolean" }, "rust-analyzer.hover.actions.gotoTypeDef.enable": { - "markdownDescription": "Whether to show `Go to Type Definition` action. Only applies when\n`#rust-analyzer.hoverActions.enable#` is set.", + "markdownDescription": "Whether to show `Go to Type Definition` action. Only applies when\n`#rust-analyzer.hover.actions.enable#` is set.", "default": true, "type": "boolean" }, "rust-analyzer.hover.actions.implementations.enable": { - "markdownDescription": "Whether to show `Implementations` action. Only applies when\n`#rust-analyzer.hoverActions.enable#` is set.", + "markdownDescription": "Whether to show `Implementations` action. Only applies when\n`#rust-analyzer.hover.actions.enable#` is set.", "default": true, "type": "boolean" }, "rust-analyzer.hover.actions.references.enable": { - "markdownDescription": "Whether to show `References` action. Only applies when\n`#rust-analyzer.hoverActions.enable#` is set.", + "markdownDescription": "Whether to show `References` action. Only applies when\n`#rust-analyzer.hover.actions.enable#` is set.", "default": false, "type": "boolean" }, "rust-analyzer.hover.actions.run.enable": { - "markdownDescription": "Whether to show `Run` action. Only applies when\n`#rust-analyzer.hoverActions.enable#` is set.", + "markdownDescription": "Whether to show `Run` action. Only applies when\n`#rust-analyzer.hover.actions.enable#` is set.", "default": true, "type": "boolean" }, diff --git a/editors/code/src/config.ts b/editors/code/src/config.ts index d34e82a1a6e..952a88acff7 100644 --- a/editors/code/src/config.ts +++ b/editors/code/src/config.ts @@ -123,12 +123,12 @@ export class Config { get hoverActions() { return { - enable: this.get("hoverActions.enable"), - implementations: this.get("hoverActions.implementations.enable"), - references: this.get("hoverActions.references.enable"), - run: this.get("hoverActions.run.enable"), - debug: this.get("hoverActions.debug.enable"), - gotoTypeDef: this.get("hoverActions.gotoTypeDef.enable"), + enable: this.get("hover.actions.enable"), + implementations: this.get("hover.actions.implementations.enable"), + references: this.get("hover.actions.references.enable"), + run: this.get("hover.actions.run.enable"), + debug: this.get("hover.actions.debug.enable"), + gotoTypeDef: this.get("hover.actions.gotoTypeDef.enable"), }; } @@ -164,12 +164,12 @@ export async function updateConfig(config: vscode.WorkspaceConfiguration) { ["hover.documentation", "hover.documentation.enable",], ["hover.linksInHover", "hover.links.enable",], ["hoverActions.linksInHover", "hover.links.enable",], - ["hoverActions.debug", "hoverActions.debug.enable",], - ["hoverActions.enable", "hoverActions.enable.enable",], - ["hoverActions.gotoTypeDef", "hoverActions.gotoTypeDef.enable",], - ["hoverActions.implementations", "hoverActions.implementations.enable",], - ["hoverActions.references", "hoverActions.references.enable",], - ["hoverActions.run", "hoverActions.run.enable",], + ["hoverActions.debug", "hover.actions.debug.enable",], + ["hoverActions.enable", "hover.actions.enable.enable",], + ["hoverActions.gotoTypeDef", "hover.actions.gotoTypeDef.enable",], + ["hoverActions.implementations", "hover.actions.implementations.enable",], + ["hoverActions.references", "hover.actions.references.enable",], + ["hoverActions.run", "hover.actions.run.enable",], ["inlayHints.chainingHints", "inlayHints.chainingHints.enable",], ["inlayHints.closureReturnTypeHints", "inlayHints.closureReturnTypeHints.enable",], ["inlayHints.hideNamedConstructorHints", "inlayHints.typeHints.hideNamedConstructorHints",],