diff --git a/src/tools/rust-analyzer/crates/rust-analyzer/src/config.rs b/src/tools/rust-analyzer/crates/rust-analyzer/src/config.rs index e71ad9da9572c..5905137967890 100644 --- a/src/tools/rust-analyzer/crates/rust-analyzer/src/config.rs +++ b/src/tools/rust-analyzer/crates/rust-analyzer/src/config.rs @@ -655,9 +655,6 @@ config_data! { lens_debug_enable: bool = true, /// Whether to show CodeLens in Rust files. lens_enable: bool = true, - /// Internal config: use custom client-side commands even when the - /// client doesn't set the corresponding capability. - lens_forceCustomCommands: bool = true, /// Whether to show `Implementations` lens. Only applies when /// `#rust-analyzer.lens.enable#` is set. lens_implementations_enable: bool = true, @@ -2031,11 +2028,9 @@ impl Config { } pub fn client_commands(&self) -> ClientCommandsConfig { - let commands = self.commands(); - let force = commands.is_none() && *self.lens_forceCustomCommands(); - let commands = commands.map(|it| it.commands).unwrap_or_default(); + let commands = self.commands().map(|it| it.commands).unwrap_or_default(); - let get = |name: &str| commands.iter().any(|it| it == name) || force; + let get = |name: &str| commands.iter().any(|it| it == name); ClientCommandsConfig { run_single: get("rust-analyzer.runSingle"), diff --git a/src/tools/rust-analyzer/docs/user/generated_config.adoc b/src/tools/rust-analyzer/docs/user/generated_config.adoc index cb876e8536604..542c539bde428 100644 --- a/src/tools/rust-analyzer/docs/user/generated_config.adoc +++ b/src/tools/rust-analyzer/docs/user/generated_config.adoc @@ -764,12 +764,6 @@ Whether to show `Debug` lens. Only applies when -- Whether to show CodeLens in Rust files. -- -[[rust-analyzer.lens.forceCustomCommands]]rust-analyzer.lens.forceCustomCommands (default: `true`):: -+ --- -Internal config: use custom client-side commands even when the -client doesn't set the corresponding capability. --- [[rust-analyzer.lens.implementations.enable]]rust-analyzer.lens.implementations.enable (default: `true`):: + -- diff --git a/src/tools/rust-analyzer/editors/code/package.json b/src/tools/rust-analyzer/editors/code/package.json index 575033a588641..eee4fe3706d2f 100644 --- a/src/tools/rust-analyzer/editors/code/package.json +++ b/src/tools/rust-analyzer/editors/code/package.json @@ -2138,16 +2138,6 @@ } } }, - { - "title": "lens", - "properties": { - "rust-analyzer.lens.forceCustomCommands": { - "markdownDescription": "Internal config: use custom client-side commands even when the\nclient doesn't set the corresponding capability.", - "default": true, - "type": "boolean" - } - } - }, { "title": "lens", "properties": {