Skip to content

Commit 61df441

Browse files
committed
Auto merge of #17675 - PaulDotSH:remove-lens-force-custom-commands-config, r=lnicola
Remove lens.forceCustomCommands config Closes #17643 A very simple PR that removes the lens.forceCustomCommands config feature without side effects.
2 parents 329adb5 + 45608bb commit 61df441

File tree

3 files changed

+1
-20
lines changed

3 files changed

+1
-20
lines changed

crates/rust-analyzer/src/config.rs

+1-4
Original file line numberDiff line numberDiff line change
@@ -655,9 +655,6 @@ config_data! {
655655
lens_debug_enable: bool = true,
656656
/// Whether to show CodeLens in Rust files.
657657
lens_enable: bool = true,
658-
/// Internal config: use custom client-side commands even when the
659-
/// client doesn't set the corresponding capability.
660-
lens_forceCustomCommands: bool = true,
661658
/// Whether to show `Implementations` lens. Only applies when
662659
/// `#rust-analyzer.lens.enable#` is set.
663660
lens_implementations_enable: bool = true,
@@ -2032,7 +2029,7 @@ impl Config {
20322029

20332030
pub fn client_commands(&self) -> ClientCommandsConfig {
20342031
let commands = self.commands();
2035-
let force = commands.is_none() && *self.lens_forceCustomCommands();
2032+
let force = commands.is_none();
20362033
let commands = commands.map(|it| it.commands).unwrap_or_default();
20372034

20382035
let get = |name: &str| commands.iter().any(|it| it == name) || force;

docs/user/generated_config.adoc

-6
Original file line numberDiff line numberDiff line change
@@ -764,12 +764,6 @@ Whether to show `Debug` lens. Only applies when
764764
--
765765
Whether to show CodeLens in Rust files.
766766
--
767-
[[rust-analyzer.lens.forceCustomCommands]]rust-analyzer.lens.forceCustomCommands (default: `true`)::
768-
+
769-
--
770-
Internal config: use custom client-side commands even when the
771-
client doesn't set the corresponding capability.
772-
--
773767
[[rust-analyzer.lens.implementations.enable]]rust-analyzer.lens.implementations.enable (default: `true`)::
774768
+
775769
--

editors/code/package.json

-10
Original file line numberDiff line numberDiff line change
@@ -2138,16 +2138,6 @@
21382138
}
21392139
}
21402140
},
2141-
{
2142-
"title": "lens",
2143-
"properties": {
2144-
"rust-analyzer.lens.forceCustomCommands": {
2145-
"markdownDescription": "Internal config: use custom client-side commands even when the\nclient doesn't set the corresponding capability.",
2146-
"default": true,
2147-
"type": "boolean"
2148-
}
2149-
}
2150-
},
21512141
{
21522142
"title": "lens",
21532143
"properties": {

0 commit comments

Comments
 (0)