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

flatten

Browse source
This commit is contained in:
Aleksey Kladov 2020-10-15 16:51:55 +02:00
parent c8cbd398e4
commit e9903a91cd
1 changed files with 32 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
crates/ide/src/diagnostics.rs
View file

@ -201,35 +201,42 @@ fn check_expr_field_shorthand(
acc: &mut Vec<Diagnostic>,
file_id: FileId,
record_lit: ast::RecordExpr,
) -> Option<()> {
let record_field_list = record_lit.record_expr_field_list()?;
) {
let record_field_list = match record_lit.record_expr_field_list() {
Some(it) => it,
None => (),
};
for record_field in record_field_list.fields() {
if let (Some(name_ref), Some(expr)) = (record_field.name_ref(), record_field.expr()) {
let field_name = name_ref.syntax().text().to_string();
let field_expr = expr.syntax().text().to_string();
let field_name_is_tup_index = name_ref.as_tuple_field().is_some();
if field_name == field_expr && !field_name_is_tup_index {
let mut edit_builder = TextEdit::builder();
edit_builder.delete(record_field.syntax().text_range());
edit_builder.insert(record_field.syntax().text_range().start(), field_name);
let edit = edit_builder.finish();
let (name_ref, expr) = match record_field.name_ref().zip(record_field.expr()) {
Some(it) => it,
None => continue,
};
let field_range = record_field.syntax().text_range();
acc.push(Diagnostic {
// name: None,
range: field_range,
message: "Shorthand struct initialization".to_string(),
severity: Severity::WeakWarning,
fix: Some(Fix::new(
"Use struct shorthand initialization",
SourceFileEdit { file_id, edit }.into(),
field_range,
)),
});
}
let field_name = name_ref.syntax().text().to_string();
let field_expr = expr.syntax().text().to_string();
let field_name_is_tup_index = name_ref.as_tuple_field().is_some();
if field_name != field_expr || field_name_is_tup_index {
continue;
}
let mut edit_builder = TextEdit::builder();
edit_builder.delete(record_field.syntax().text_range());
edit_builder.insert(record_field.syntax().text_range().start(), field_name);
let edit = edit_builder.finish();
let field_range = record_field.syntax().text_range();
acc.push(Diagnostic {
// name: None,
range: field_range,
message: "Shorthand struct initialization".to_string(),
severity: Severity::WeakWarning,
fix: Some(Fix::new(
"Use struct shorthand initialization",
SourceFileEdit { file_id, edit }.into(),
field_range,
)),
});
}
Some(())
}
#[cfg(test)]