Skip to content

Commit 5b1a5a2

Browse files
committed
Rename rust-analyzer commands
The commands `editor.action.triggerParameterHints` and `editor.action.rename` are now renamed to `rust-analyzer.triggerParameterHints` and `rust-analyzer.rename` This change helps make it clear that these commands are specific to rust-analyzer and not part of the default set of commands provided by VSCode. Fixes: #17644
1 parent 062822c commit 5b1a5a2

File tree

6 files changed

+9
-9
lines changed

6 files changed

+9
-9
lines changed

crates/ide-assists/src/handlers/add_turbo_fish.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ pub(crate) fn add_turbo_fish(acc: &mut Assists, ctx: &AssistContext<'_>) -> Opti
124124
"Add `::<>`",
125125
ident.text_range(),
126126
|edit| {
127-
edit.trigger_signature_help();
127+
edit.trigger_parameter_hints();
128128

129129
let new_arg_list = match turbofish_target {
130130
Either::Left(path_segment) => {

crates/ide-db/src/assists.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ pub struct Assist {
3636
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
3737
pub enum Command {
3838
/// Show the parameter hints popup.
39-
TriggerSignatureHelp,
39+
TriggerParameterHints,
4040
/// Rename the just inserted item.
4141
Rename,
4242
}

crates/ide-db/src/source_change.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -307,8 +307,8 @@ impl SourceChangeBuilder {
307307
}
308308

309309
/// Triggers the parameter hint popup after the assist is applied
310-
pub fn trigger_signature_help(&mut self) {
311-
self.command = Some(Command::TriggerSignatureHelp);
310+
pub fn trigger_parameter_hints(&mut self) {
311+
self.command = Some(Command::TriggerParameterHints);
312312
}
313313

314314
/// Renames the item at the cursor position after the assist is applied

crates/rust-analyzer/src/config.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -2042,8 +2042,8 @@ impl Config {
20422042
debug_single: get("rust-analyzer.debugSingle"),
20432043
show_reference: get("rust-analyzer.showReferences"),
20442044
goto_location: get("rust-analyzer.gotoLocation"),
2045-
trigger_parameter_hints: get("editor.action.triggerParameterHints"),
2046-
rename: get("editor.action.rename"),
2045+
trigger_parameter_hints: get("rust-analyzer.triggerParameterHints"),
2046+
rename: get("rust-analyzer.rename"),
20472047
}
20482048
}
20492049

crates/rust-analyzer/src/lsp/to_proto.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1338,7 +1338,7 @@ pub(crate) fn code_action(
13381338

13391339
let commands = snap.config.client_commands();
13401340
res.command = match assist.command {
1341-
Some(assists::Command::TriggerSignatureHelp) if commands.trigger_parameter_hints => {
1341+
Some(assists::Command::TriggerParameterHints) if commands.trigger_parameter_hints => {
13421342
Some(command::trigger_parameter_hints())
13431343
}
13441344
Some(assists::Command::Rename) if commands.rename => Some(command::rename()),

editors/code/src/client.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -347,8 +347,8 @@ class ExperimentalFeatures implements lc.StaticFeature {
347347
"rust-analyzer.debugSingle",
348348
"rust-analyzer.showReferences",
349349
"rust-analyzer.gotoLocation",
350-
"editor.action.triggerParameterHints",
351-
"editor.action.rename",
350+
"rust-analyzer.triggerParameterHints",
351+
"rust-analyzer.rename",
352352
],
353353
},
354354
...capabilities.experimental,

0 commit comments

Comments
 (0)