Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-27 21:43:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #17647 - joshka:jm/rename-commands, r=Veykril

Browse source 
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: https://github.com/rust-lang/rust-analyzer/issues/17644

Note: This seems like it will be a breaking change for any RA client that previously reacted to `editor.action.triggerParameterHints` - naive search: https://github.com/search?q=editor.action.triggerParameterHints+AND+%28NOT+is%3Afork%29+rust-analyzer&type=code
This commit is contained in:
bors 2024-07-22 08:10:03 +00:00
commit c29bac1cdf
6 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
crates/ide-assists/src/handlers/add_turbo_fish.rs
View file

@ -124,7 +124,7 @@ pub(crate) fn add_turbo_fish(acc: &mut Assists, ctx: &AssistContext<'_>) -> Opti
"Add `::<>`", "Add `::<>`",
ident.text_range(), ident.text_range(),
|edit| { |edit| {
edit.trigger_signature_help(); edit.trigger_parameter_hints();
let new_arg_list = match turbofish_target { let new_arg_list = match turbofish_target {
Either::Left(path_segment) => { Either::Left(path_segment) => {

2
crates/ide-db/src/assists.rs
View file

@ -36,7 +36,7 @@ pub struct Assist {
#[derive(Debug, Clone, Copy, PartialEq, Eq)] #[derive(Debug, Clone, Copy, PartialEq, Eq)]
pub enum Command { pub enum Command {
/// Show the parameter hints popup. /// Show the parameter hints popup.
TriggerSignatureHelp, TriggerParameterHints,
/// Rename the just inserted item. /// Rename the just inserted item.
Rename, Rename,
} }

4
crates/ide-db/src/source_change.rs
View file

@ -307,8 +307,8 @@ impl SourceChangeBuilder {
} }
/// Triggers the parameter hint popup after the assist is applied /// Triggers the parameter hint popup after the assist is applied
pub fn trigger_signature_help(&mut self) { pub fn trigger_parameter_hints(&mut self) {
self.command = Some(Command::TriggerSignatureHelp); self.command = Some(Command::TriggerParameterHints);
} }
/// Renames the item at the cursor position after the assist is applied /// Renames the item at the cursor position after the assist is applied

4
crates/rust-analyzer/src/config.rs
View file

@ -2042,8 +2042,8 @@ impl Config {
debug_single: get("rust-analyzer.debugSingle"), debug_single: get("rust-analyzer.debugSingle"),
show_reference: get("rust-analyzer.showReferences"), show_reference: get("rust-analyzer.showReferences"),
goto_location: get("rust-analyzer.gotoLocation"), goto_location: get("rust-analyzer.gotoLocation"),
trigger_parameter_hints: get("editor.action.triggerParameterHints"), trigger_parameter_hints: get("rust-analyzer.triggerParameterHints"),
rename: get("editor.action.rename"), rename: get("rust-analyzer.rename"),
} }
} }

2
crates/rust-analyzer/src/lsp/to_proto.rs
View file

@ -1338,7 +1338,7 @@ pub(crate) fn code_action(
let commands = snap.config.client_commands(); let commands = snap.config.client_commands();
res.command = match assist.command { res.command = match assist.command {
Some(assists::Command::TriggerSignatureHelp) if commands.trigger_parameter_hints => { Some(assists::Command::TriggerParameterHints) if commands.trigger_parameter_hints => {
Some(command::trigger_parameter_hints()) Some(command::trigger_parameter_hints())
} }
Some(assists::Command::Rename) if commands.rename => Some(command::rename()), Some(assists::Command::Rename) if commands.rename => Some(command::rename()),

4
editors/code/src/client.ts
View file

@ -347,8 +347,8 @@ class ExperimentalFeatures implements lc.StaticFeature {
"rust-analyzer.debugSingle", "rust-analyzer.debugSingle",
"rust-analyzer.showReferences", "rust-analyzer.showReferences",
"rust-analyzer.gotoLocation", "rust-analyzer.gotoLocation",
"editor.action.triggerParameterHints", "rust-analyzer.triggerParameterHints",
"editor.action.rename", "rust-analyzer.rename",
], ],
}, },
...capabilities.experimental, ...capabilities.experimental,