mirror of
https://github.com/rust-lang/rust-analyzer.git
synced 2025-11-03 05:13:35 +00:00
And make more queries non-interned. Also flip the default for queries, now the default is to not intern and to intern a query you need to say `invoke_interned`.
223 lines
5.6 KiB
Rust
223 lines
5.6 KiB
Rust
use either::Either;
|
|
use ide_db::FxHashMap;
|
|
use itertools::Itertools;
|
|
use syntax::{AstNode, SmolStr, SyntaxElement, ToSmolStr, ast, syntax_editor::SyntaxEditor};
|
|
|
|
use crate::{AssistContext, AssistId, Assists};
|
|
|
|
// Assist: reorder_fields
|
|
//
|
|
// Reorder the fields of record literals and record patterns in the same order as in
|
|
// the definition.
|
|
//
|
|
// ```
|
|
// struct Foo {foo: i32, bar: i32};
|
|
// const test: Foo = $0Foo {bar: 0, foo: 1}
|
|
// ```
|
|
// ->
|
|
// ```
|
|
// struct Foo {foo: i32, bar: i32};
|
|
// const test: Foo = Foo {foo: 1, bar: 0}
|
|
// ```
|
|
pub(crate) fn reorder_fields(acc: &mut Assists, ctx: &AssistContext<'_>) -> Option<()> {
|
|
let path = ctx.find_node_at_offset::<ast::Path>()?;
|
|
let record =
|
|
path.syntax().parent().and_then(<Either<ast::RecordExpr, ast::RecordPat>>::cast)?;
|
|
|
|
let parent_node = match ctx.covering_element() {
|
|
SyntaxElement::Node(n) => n,
|
|
SyntaxElement::Token(t) => t.parent()?,
|
|
};
|
|
|
|
let ranks = compute_fields_ranks(&path, ctx)?;
|
|
let get_rank_of_field = |of: Option<SmolStr>| {
|
|
*ranks.get(of.unwrap_or_default().trim_start_matches("r#")).unwrap_or(&usize::MAX)
|
|
};
|
|
|
|
let field_list = match &record {
|
|
Either::Left(it) => Either::Left(it.record_expr_field_list()?),
|
|
Either::Right(it) => Either::Right(it.record_pat_field_list()?),
|
|
};
|
|
let fields = match field_list {
|
|
Either::Left(it) => Either::Left((
|
|
it.fields()
|
|
.sorted_unstable_by_key(|field| {
|
|
get_rank_of_field(field.field_name().map(|it| it.to_smolstr()))
|
|
})
|
|
.collect::<Vec<_>>(),
|
|
it,
|
|
)),
|
|
Either::Right(it) => Either::Right((
|
|
it.fields()
|
|
.sorted_unstable_by_key(|field| {
|
|
get_rank_of_field(field.field_name().map(|it| it.to_smolstr()))
|
|
})
|
|
.collect::<Vec<_>>(),
|
|
it,
|
|
)),
|
|
};
|
|
|
|
let is_sorted = fields.as_ref().either(
|
|
|(sorted, field_list)| field_list.fields().zip(sorted).all(|(a, b)| a == *b),
|
|
|(sorted, field_list)| field_list.fields().zip(sorted).all(|(a, b)| a == *b),
|
|
);
|
|
if is_sorted {
|
|
cov_mark::hit!(reorder_sorted_fields);
|
|
return None;
|
|
}
|
|
let target = record.as_ref().either(AstNode::syntax, AstNode::syntax).text_range();
|
|
acc.add(
|
|
AssistId::refactor_rewrite("reorder_fields"),
|
|
"Reorder record fields",
|
|
target,
|
|
|builder| {
|
|
let mut editor = builder.make_editor(&parent_node);
|
|
|
|
match fields {
|
|
Either::Left((sorted, field_list)) => {
|
|
replace(&mut editor, field_list.fields(), sorted)
|
|
}
|
|
Either::Right((sorted, field_list)) => {
|
|
replace(&mut editor, field_list.fields(), sorted)
|
|
}
|
|
}
|
|
|
|
builder.add_file_edits(ctx.vfs_file_id(), editor);
|
|
},
|
|
)
|
|
}
|
|
|
|
fn replace<T: AstNode + PartialEq>(
|
|
editor: &mut SyntaxEditor,
|
|
fields: impl Iterator<Item = T>,
|
|
sorted_fields: impl IntoIterator<Item = T>,
|
|
) {
|
|
fields
|
|
.zip(sorted_fields)
|
|
.for_each(|(field, sorted_field)| editor.replace(field.syntax(), sorted_field.syntax()));
|
|
}
|
|
|
|
fn compute_fields_ranks(
|
|
path: &ast::Path,
|
|
ctx: &AssistContext<'_>,
|
|
) -> Option<FxHashMap<String, usize>> {
|
|
let strukt = match ctx.sema.resolve_path(path) {
|
|
Some(hir::PathResolution::Def(hir::ModuleDef::Adt(hir::Adt::Struct(it)))) => it,
|
|
_ => return None,
|
|
};
|
|
|
|
let res = strukt
|
|
.fields(ctx.db())
|
|
.into_iter()
|
|
.enumerate()
|
|
.map(|(idx, field)| (field.name(ctx.db()).as_str().to_owned(), idx))
|
|
.collect();
|
|
|
|
Some(res)
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use crate::tests::{check_assist, check_assist_not_applicable};
|
|
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn reorder_sorted_fields() {
|
|
cov_mark::check!(reorder_sorted_fields);
|
|
check_assist_not_applicable(
|
|
reorder_fields,
|
|
r#"
|
|
struct Foo { foo: i32, bar: i32 }
|
|
const test: Foo = $0Foo { foo: 0, bar: 0 };
|
|
"#,
|
|
)
|
|
}
|
|
|
|
#[test]
|
|
fn trivial_empty_fields() {
|
|
check_assist_not_applicable(
|
|
reorder_fields,
|
|
r#"
|
|
struct Foo {}
|
|
const test: Foo = $0Foo {};
|
|
"#,
|
|
)
|
|
}
|
|
|
|
#[test]
|
|
fn reorder_struct_fields() {
|
|
check_assist(
|
|
reorder_fields,
|
|
r#"
|
|
struct Foo { foo: i32, bar: i32 }
|
|
const test: Foo = $0Foo { bar: 0, foo: 1 };
|
|
"#,
|
|
r#"
|
|
struct Foo { foo: i32, bar: i32 }
|
|
const test: Foo = Foo { foo: 1, bar: 0 };
|
|
"#,
|
|
)
|
|
}
|
|
#[test]
|
|
fn reorder_struct_pattern() {
|
|
check_assist(
|
|
reorder_fields,
|
|
r#"
|
|
struct Foo { foo: i64, bar: i64, baz: i64 }
|
|
|
|
fn f(f: Foo) -> {
|
|
match f {
|
|
$0Foo { baz: 0, ref mut bar, .. } => (),
|
|
_ => ()
|
|
}
|
|
}
|
|
"#,
|
|
r#"
|
|
struct Foo { foo: i64, bar: i64, baz: i64 }
|
|
|
|
fn f(f: Foo) -> {
|
|
match f {
|
|
Foo { ref mut bar, baz: 0, .. } => (),
|
|
_ => ()
|
|
}
|
|
}
|
|
"#,
|
|
)
|
|
}
|
|
|
|
#[test]
|
|
fn reorder_with_extra_field() {
|
|
check_assist(
|
|
reorder_fields,
|
|
r#"
|
|
struct Foo { foo: String, bar: String }
|
|
|
|
impl Foo {
|
|
fn new() -> Foo {
|
|
let foo = String::new();
|
|
$0Foo {
|
|
bar: foo.clone(),
|
|
extra: "Extra field",
|
|
foo,
|
|
}
|
|
}
|
|
}
|
|
"#,
|
|
r#"
|
|
struct Foo { foo: String, bar: String }
|
|
|
|
impl Foo {
|
|
fn new() -> Foo {
|
|
let foo = String::new();
|
|
Foo {
|
|
foo,
|
|
bar: foo.clone(),
|
|
extra: "Extra field",
|
|
}
|
|
}
|
|
}
|
|
"#,
|
|
)
|
|
}
|
|
}
|