language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-30 19:49:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

fix(ide-assists): remove AssistKind::None

Browse source 
This was being used by a single assist, which qualifies under the "refactor"
kind. The variant has been removed, and all usages updated accordingly.

Signed-off-by: Prajwal S N <prajwalnadig21@gmail.com>
This commit is contained in:
Prajwal S N 2025-04-03 14:29:02 +05:30
parent c7845a6d70
commit e02d76aa61
No known key found for this signature in database
GPG key ID: 60701A603988FAC2
5 changed files with 5 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/ide-assists/src/handlers/toggle_ignore.rs
View file

@ -30,13 +30,13 @@ pub(crate) fn toggle_ignore(acc: &mut Assists, ctx: &AssistContext<'_>) -> Optio
match has_ignore_attribute(&func) { match has_ignore_attribute(&func) {
None => acc.add( None => acc.add(
AssistId::none("toggle_ignore"), AssistId::refactor("toggle_ignore"),
"Ignore this test", "Ignore this test",
attr.syntax().text_range(), attr.syntax().text_range(),
|builder| builder.insert(attr.syntax().text_range().end(), "\n#[ignore]"), |builder| builder.insert(attr.syntax().text_range().end(), "\n#[ignore]"),
), ),
Some(ignore_attr) => acc.add( Some(ignore_attr) => acc.add(
AssistId::none("toggle_ignore"), AssistId::refactor("toggle_ignore"),
"Re-enable this test", "Re-enable this test",
ignore_attr.syntax().text_range(), ignore_attr.syntax().text_range(),
|builder| { |builder| {

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

@ -43,9 +43,6 @@ pub enum Command {
#[derive(Debug, Clone, Copy, PartialEq, Eq)] #[derive(Debug, Clone, Copy, PartialEq, Eq)]
pub enum AssistKind { pub enum AssistKind {
// FIXME: does the None variant make sense? Probably not.
None,
QuickFix, QuickFix,
Generate, Generate,
Refactor, Refactor,
@ -61,7 +58,7 @@ impl AssistKind {
} }
match self { match self {
AssistKind::None | AssistKind::Generate => true, AssistKind::Generate => true,
AssistKind::Refactor => matches!( AssistKind::Refactor => matches!(
other, other,
AssistKind::RefactorExtract AssistKind::RefactorExtract
@ -74,7 +71,6 @@ impl AssistKind {
pub fn name(&self) -> &str { pub fn name(&self) -> &str {
match self { match self {
AssistKind::None => "None",
AssistKind::QuickFix => "QuickFix", AssistKind::QuickFix => "QuickFix",
AssistKind::Generate => "Generate", AssistKind::Generate => "Generate",
AssistKind::Refactor => "Refactor", AssistKind::Refactor => "Refactor",
@ -90,7 +86,6 @@ impl FromStr for AssistKind {
fn from_str(s: &str) -> Result<Self, Self::Err> { fn from_str(s: &str) -> Result<Self, Self::Err> {
match s { match s {
"None" => Ok(AssistKind::None),
"QuickFix" => Ok(AssistKind::QuickFix), "QuickFix" => Ok(AssistKind::QuickFix),
"Generate" => Ok(AssistKind::Generate), "Generate" => Ok(AssistKind::Generate),
"Refactor" => Ok(AssistKind::Refactor), "Refactor" => Ok(AssistKind::Refactor),
@ -108,10 +103,6 @@ impl FromStr for AssistKind {
pub struct AssistId(pub &'static str, pub AssistKind, pub Option<usize>); pub struct AssistId(pub &'static str, pub AssistKind, pub Option<usize>);
impl AssistId { impl AssistId {
pub fn none(id: &'static str) -> AssistId {
AssistId(id, AssistKind::None, None)
}
pub fn quick_fix(id: &'static str) -> AssistId { pub fn quick_fix(id: &'static str) -> AssistId {
AssistId(id, AssistKind::QuickFix, None) AssistId(id, AssistKind::QuickFix, None)
} }

2
crates/ide/src/lib.rs
View file

@ -753,7 +753,7 @@ impl Analysis {
frange: FileRange, frange: FileRange,
) -> Cancellable<Vec<Assist>> { ) -> Cancellable<Vec<Assist>> {
let include_fixes = match &assist_config.allowed { let include_fixes = match &assist_config.allowed {
Some(it) => it.iter().any(|&it| it == AssistKind::None || it == AssistKind::QuickFix), Some(it) => it.iter().any(|&it| it == AssistKind::QuickFix),
None => true, None => true,
}; };

1
crates/rust-analyzer/src/lsp/from_proto.rs
View file

@ -103,7 +103,6 @@ pub(crate) fn file_range_uri(
pub(crate) fn assist_kind(kind: lsp_types::CodeActionKind) -> Option<AssistKind> { pub(crate) fn assist_kind(kind: lsp_types::CodeActionKind) -> Option<AssistKind> {
let assist_kind = match &kind { let assist_kind = match &kind {
k if k == &lsp_types::CodeActionKind::EMPTY => AssistKind::None,
k if k == &lsp_types::CodeActionKind::QUICKFIX => AssistKind::QuickFix, k if k == &lsp_types::CodeActionKind::QUICKFIX => AssistKind::QuickFix,
k if k == &lsp_types::CodeActionKind::REFACTOR => AssistKind::Refactor, k if k == &lsp_types::CodeActionKind::REFACTOR => AssistKind::Refactor,
k if k == &lsp_types::CodeActionKind::REFACTOR_EXTRACT => AssistKind::RefactorExtract, k if k == &lsp_types::CodeActionKind::REFACTOR_EXTRACT => AssistKind::RefactorExtract,

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

@ -1477,7 +1477,7 @@ pub(crate) fn call_hierarchy_item(
pub(crate) fn code_action_kind(kind: AssistKind) -> lsp_types::CodeActionKind { pub(crate) fn code_action_kind(kind: AssistKind) -> lsp_types::CodeActionKind {
match kind { match kind {
AssistKind::None | AssistKind::Generate => lsp_types::CodeActionKind::EMPTY, AssistKind::Generate => lsp_types::CodeActionKind::EMPTY,
AssistKind::QuickFix => lsp_types::CodeActionKind::QUICKFIX, AssistKind::QuickFix => lsp_types::CodeActionKind::QUICKFIX,
AssistKind::Refactor => lsp_types::CodeActionKind::REFACTOR, AssistKind::Refactor => lsp_types::CodeActionKind::REFACTOR,
AssistKind::RefactorExtract => lsp_types::CodeActionKind::REFACTOR_EXTRACT, AssistKind::RefactorExtract => lsp_types::CodeActionKind::REFACTOR_EXTRACT,