2020-04-17 11:06:02 +00:00
|
|
|
//! Collects diagnostics & fixits for a single file.
|
|
|
|
//!
|
|
|
|
//! The tricky bit here is that diagnostics are produced by hir in terms of
|
|
|
|
//! macro-expanded files, but we need to present them to the users in terms of
|
|
|
|
//! original files. So we need to map the ranges.
|
2019-09-30 08:58:53 +00:00
|
|
|
|
2019-03-24 07:21:36 +00:00
|
|
|
use std::cell::RefCell;
|
|
|
|
|
2020-02-18 17:35:10 +00:00
|
|
|
use hir::{
|
|
|
|
diagnostics::{AstDiagnostic, Diagnostic as _, DiagnosticSink},
|
2020-06-09 21:11:16 +00:00
|
|
|
HasSource, HirDisplay, Semantics, VariantDef,
|
2020-02-18 17:35:10 +00:00
|
|
|
};
|
2019-03-21 16:05:15 +00:00
|
|
|
use itertools::Itertools;
|
2020-06-16 16:45:58 +00:00
|
|
|
use ra_db::SourceDatabase;
|
2020-02-06 11:52:32 +00:00
|
|
|
use ra_ide_db::RootDatabase;
|
2019-07-04 20:05:17 +00:00
|
|
|
use ra_prof::profile;
|
2019-03-21 16:05:15 +00:00
|
|
|
use ra_syntax::{
|
2019-09-30 06:27:26 +00:00
|
|
|
algo,
|
2020-06-09 21:11:16 +00:00
|
|
|
ast::{self, edit::IndentLevel, make, AstNode},
|
2020-02-06 00:33:18 +00:00
|
|
|
SyntaxNode, TextRange, T,
|
2019-03-21 16:05:15 +00:00
|
|
|
};
|
|
|
|
use ra_text_edit::{TextEdit, TextEditBuilder};
|
|
|
|
|
2020-06-08 19:44:42 +00:00
|
|
|
use crate::{Diagnostic, FileId, FileSystemEdit, Fix, SourceFileEdit};
|
2019-01-08 19:33:36 +00:00
|
|
|
|
2019-03-23 16:34:49 +00:00
|
|
|
#[derive(Debug, Copy, Clone)]
|
|
|
|
pub enum Severity {
|
|
|
|
Error,
|
|
|
|
WeakWarning,
|
|
|
|
}
|
|
|
|
|
2019-02-08 11:30:21 +00:00
|
|
|
pub(crate) fn diagnostics(db: &RootDatabase, file_id: FileId) -> Vec<Diagnostic> {
|
2019-05-05 14:32:53 +00:00
|
|
|
let _p = profile("diagnostics");
|
2020-02-18 17:35:10 +00:00
|
|
|
let sema = Semantics::new(db);
|
2019-05-28 15:46:11 +00:00
|
|
|
let parse = db.parse(file_id);
|
2019-03-21 16:21:00 +00:00
|
|
|
let mut res = Vec::new();
|
|
|
|
|
2019-07-12 16:41:13 +00:00
|
|
|
res.extend(parse.errors().iter().map(|err| Diagnostic {
|
2020-02-10 00:08:49 +00:00
|
|
|
range: err.range(),
|
2019-05-28 15:46:11 +00:00
|
|
|
message: format!("Syntax Error: {}", err),
|
|
|
|
severity: Severity::Error,
|
|
|
|
fix: None,
|
|
|
|
}));
|
|
|
|
|
2019-07-12 16:41:13 +00:00
|
|
|
for node in parse.tree().syntax().descendants() {
|
2019-07-19 09:56:47 +00:00
|
|
|
check_unnecessary_braces_in_use_statement(&mut res, file_id, &node);
|
|
|
|
check_struct_shorthand_initialization(&mut res, file_id, &node);
|
2019-03-21 16:21:00 +00:00
|
|
|
}
|
2019-03-24 07:21:36 +00:00
|
|
|
let res = RefCell::new(res);
|
|
|
|
let mut sink = DiagnosticSink::new(|d| {
|
|
|
|
res.borrow_mut().push(Diagnostic {
|
|
|
|
message: d.message(),
|
2020-04-17 11:06:02 +00:00
|
|
|
range: sema.diagnostics_range(d).range,
|
2019-03-24 07:21:36 +00:00
|
|
|
severity: Severity::Error,
|
|
|
|
fix: None,
|
|
|
|
})
|
|
|
|
})
|
|
|
|
.on::<hir::diagnostics::UnresolvedModule, _>(|d| {
|
2019-10-09 11:27:37 +00:00
|
|
|
let original_file = d.source().file_id.original_file(db);
|
2020-06-16 16:45:58 +00:00
|
|
|
let fix = Fix::new(
|
|
|
|
"Create module",
|
|
|
|
FileSystemEdit::CreateFile { anchor: original_file, dst: d.candidate.clone() }.into(),
|
|
|
|
);
|
2019-03-24 07:21:36 +00:00
|
|
|
res.borrow_mut().push(Diagnostic {
|
2020-04-17 11:06:02 +00:00
|
|
|
range: sema.diagnostics_range(d).range,
|
2019-03-24 07:21:36 +00:00
|
|
|
message: d.message(),
|
|
|
|
severity: Severity::Error,
|
|
|
|
fix: Some(fix),
|
|
|
|
})
|
2019-04-10 21:00:56 +00:00
|
|
|
})
|
|
|
|
.on::<hir::diagnostics::MissingFields, _>(|d| {
|
2020-01-07 18:17:58 +00:00
|
|
|
// Note that although we could add a diagnostics to
|
|
|
|
// fill the missing tuple field, e.g :
|
|
|
|
// `struct A(usize);`
|
|
|
|
// `let a = A { 0: () }`
|
|
|
|
// but it is uncommon usage and it should not be encouraged.
|
|
|
|
let fix = if d.missed_fields.iter().any(|it| it.as_tuple_index().is_some()) {
|
|
|
|
None
|
|
|
|
} else {
|
|
|
|
let mut field_list = d.ast(db);
|
|
|
|
for f in d.missed_fields.iter() {
|
|
|
|
let field =
|
|
|
|
make::record_field(make::name_ref(&f.to_string()), Some(make::expr_unit()));
|
|
|
|
field_list = field_list.append_field(&field);
|
2020-01-07 18:08:17 +00:00
|
|
|
}
|
2019-04-10 21:00:56 +00:00
|
|
|
|
2020-05-22 16:03:08 +00:00
|
|
|
let edit = {
|
|
|
|
let mut builder = TextEditBuilder::default();
|
|
|
|
algo::diff(&d.ast(db).syntax(), &field_list.syntax()).into_text_edit(&mut builder);
|
|
|
|
builder.finish()
|
|
|
|
};
|
|
|
|
Some(Fix::new("Fill struct fields", SourceFileEdit { file_id, edit }.into()))
|
2020-01-07 18:17:58 +00:00
|
|
|
};
|
2019-09-30 06:27:26 +00:00
|
|
|
|
2019-04-10 21:00:56 +00:00
|
|
|
res.borrow_mut().push(Diagnostic {
|
2020-04-17 11:06:02 +00:00
|
|
|
range: sema.diagnostics_range(d).range,
|
2019-04-10 21:00:56 +00:00
|
|
|
message: d.message(),
|
|
|
|
severity: Severity::Error,
|
2020-01-07 18:17:58 +00:00
|
|
|
fix,
|
2019-04-10 21:00:56 +00:00
|
|
|
})
|
2019-08-10 15:40:48 +00:00
|
|
|
})
|
2020-03-24 11:40:58 +00:00
|
|
|
.on::<hir::diagnostics::MissingMatchArms, _>(|d| {
|
|
|
|
res.borrow_mut().push(Diagnostic {
|
2020-04-17 11:06:02 +00:00
|
|
|
range: sema.diagnostics_range(d).range,
|
2020-03-24 11:40:58 +00:00
|
|
|
message: d.message(),
|
|
|
|
severity: Severity::Error,
|
|
|
|
fix: None,
|
|
|
|
})
|
|
|
|
})
|
2019-08-10 15:40:48 +00:00
|
|
|
.on::<hir::diagnostics::MissingOkInTailExpr, _>(|d| {
|
|
|
|
let node = d.ast(db);
|
2019-08-17 05:31:53 +00:00
|
|
|
let replacement = format!("Ok({})", node.syntax());
|
2019-10-26 17:07:24 +00:00
|
|
|
let edit = TextEdit::replace(node.syntax().text_range(), replacement);
|
2020-06-08 19:44:42 +00:00
|
|
|
let source_change = SourceFileEdit { file_id, edit }.into();
|
2020-05-22 16:03:08 +00:00
|
|
|
let fix = Fix::new("Wrap with ok", source_change);
|
2019-08-10 15:40:48 +00:00
|
|
|
res.borrow_mut().push(Diagnostic {
|
2020-04-17 11:06:02 +00:00
|
|
|
range: sema.diagnostics_range(d).range,
|
2019-08-10 15:40:48 +00:00
|
|
|
message: d.message(),
|
|
|
|
severity: Severity::Error,
|
|
|
|
fix: Some(fix),
|
|
|
|
})
|
2020-06-09 21:11:16 +00:00
|
|
|
})
|
|
|
|
.on::<hir::diagnostics::NoSuchField, _>(|d| {
|
|
|
|
res.borrow_mut().push(Diagnostic {
|
|
|
|
range: sema.diagnostics_range(d).range,
|
|
|
|
message: d.message(),
|
|
|
|
severity: Severity::Error,
|
|
|
|
fix: missing_struct_field_fix(&sema, file_id, d),
|
|
|
|
})
|
2019-03-24 07:21:36 +00:00
|
|
|
});
|
2020-06-09 21:11:16 +00:00
|
|
|
|
2020-02-18 17:35:10 +00:00
|
|
|
if let Some(m) = sema.to_module_def(file_id) {
|
2019-03-24 07:21:36 +00:00
|
|
|
m.diagnostics(db, &mut sink);
|
2019-02-08 11:30:21 +00:00
|
|
|
};
|
2019-03-24 07:21:36 +00:00
|
|
|
drop(sink);
|
|
|
|
res.into_inner()
|
2019-01-08 19:33:36 +00:00
|
|
|
}
|
2019-03-21 16:05:15 +00:00
|
|
|
|
2020-06-09 21:11:16 +00:00
|
|
|
fn missing_struct_field_fix(
|
|
|
|
sema: &Semantics<RootDatabase>,
|
|
|
|
file_id: FileId,
|
|
|
|
d: &hir::diagnostics::NoSuchField,
|
|
|
|
) -> Option<Fix> {
|
|
|
|
let record_expr = sema.ast(d);
|
|
|
|
|
|
|
|
let record_lit = ast::RecordLit::cast(record_expr.syntax().parent()?.parent()?)?;
|
|
|
|
let def_id = sema.resolve_variant(record_lit)?;
|
|
|
|
let module;
|
|
|
|
let record_fields = match VariantDef::from(def_id) {
|
|
|
|
VariantDef::Struct(s) => {
|
|
|
|
module = s.module(sema.db);
|
|
|
|
let source = s.source(sema.db);
|
|
|
|
let fields = source.value.field_def_list()?;
|
|
|
|
record_field_def_list(fields)?
|
|
|
|
}
|
|
|
|
VariantDef::Union(u) => {
|
|
|
|
module = u.module(sema.db);
|
|
|
|
let source = u.source(sema.db);
|
|
|
|
source.value.record_field_def_list()?
|
|
|
|
}
|
|
|
|
VariantDef::EnumVariant(e) => {
|
|
|
|
module = e.module(sema.db);
|
|
|
|
let source = e.source(sema.db);
|
|
|
|
let fields = source.value.field_def_list()?;
|
|
|
|
record_field_def_list(fields)?
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
let new_field_type = sema.type_of_expr(&record_expr.expr()?)?;
|
2020-06-22 15:16:00 +00:00
|
|
|
if new_field_type.is_unknown() {
|
|
|
|
return None;
|
|
|
|
}
|
2020-06-09 21:11:16 +00:00
|
|
|
let new_field = make::record_field_def(
|
|
|
|
record_expr.field_name()?,
|
|
|
|
make::type_ref(&new_field_type.display_source_code(sema.db, module.into()).ok()?),
|
|
|
|
);
|
|
|
|
|
|
|
|
let last_field = record_fields.fields().last()?;
|
|
|
|
let last_field_syntax = last_field.syntax();
|
|
|
|
let indent = IndentLevel::from_node(last_field_syntax);
|
|
|
|
|
|
|
|
let mut new_field = format!("\n{}{}", indent, new_field);
|
|
|
|
|
|
|
|
let needs_comma = !last_field_syntax.to_string().ends_with(",");
|
|
|
|
if needs_comma {
|
|
|
|
new_field = format!(",{}", new_field);
|
|
|
|
}
|
|
|
|
|
|
|
|
let source_change = SourceFileEdit {
|
|
|
|
file_id,
|
|
|
|
edit: TextEdit::insert(last_field_syntax.text_range().end(), new_field),
|
|
|
|
};
|
|
|
|
let fix = Fix::new("Create field", source_change.into());
|
|
|
|
return Some(fix);
|
|
|
|
|
|
|
|
fn record_field_def_list(field_def_list: ast::FieldDefList) -> Option<ast::RecordFieldDefList> {
|
|
|
|
match field_def_list {
|
|
|
|
ast::FieldDefList::RecordFieldDefList(it) => Some(it),
|
|
|
|
ast::FieldDefList::TupleFieldDefList(_) => None,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-03-21 16:05:15 +00:00
|
|
|
fn check_unnecessary_braces_in_use_statement(
|
|
|
|
acc: &mut Vec<Diagnostic>,
|
2019-03-21 16:21:00 +00:00
|
|
|
file_id: FileId,
|
2019-03-21 16:05:15 +00:00
|
|
|
node: &SyntaxNode,
|
|
|
|
) -> Option<()> {
|
2019-07-19 09:56:47 +00:00
|
|
|
let use_tree_list = ast::UseTreeList::cast(node.clone())?;
|
2019-03-21 16:05:15 +00:00
|
|
|
if let Some((single_use_tree,)) = use_tree_list.use_trees().collect_tuple() {
|
2019-07-20 09:58:27 +00:00
|
|
|
let range = use_tree_list.syntax().text_range();
|
2019-03-21 16:05:15 +00:00
|
|
|
let edit =
|
2019-07-19 09:56:47 +00:00
|
|
|
text_edit_for_remove_unnecessary_braces_with_self_in_use_statement(&single_use_tree)
|
2019-03-21 16:05:15 +00:00
|
|
|
.unwrap_or_else(|| {
|
|
|
|
let to_replace = single_use_tree.syntax().text().to_string();
|
|
|
|
let mut edit_builder = TextEditBuilder::default();
|
|
|
|
edit_builder.delete(range);
|
|
|
|
edit_builder.insert(range.start(), to_replace);
|
|
|
|
edit_builder.finish()
|
|
|
|
});
|
|
|
|
|
|
|
|
acc.push(Diagnostic {
|
|
|
|
range,
|
2019-06-04 06:29:50 +00:00
|
|
|
message: "Unnecessary braces in use statement".to_string(),
|
2019-03-21 16:05:15 +00:00
|
|
|
severity: Severity::WeakWarning,
|
2020-05-22 16:03:08 +00:00
|
|
|
fix: Some(Fix::new(
|
2019-03-24 20:53:41 +00:00
|
|
|
"Remove unnecessary braces",
|
2020-05-22 16:03:08 +00:00
|
|
|
SourceFileEdit { file_id, edit }.into(),
|
2019-03-24 20:53:41 +00:00
|
|
|
)),
|
2019-03-21 16:05:15 +00:00
|
|
|
});
|
|
|
|
}
|
|
|
|
|
|
|
|
Some(())
|
|
|
|
}
|
|
|
|
|
|
|
|
fn text_edit_for_remove_unnecessary_braces_with_self_in_use_statement(
|
|
|
|
single_use_tree: &ast::UseTree,
|
|
|
|
) -> Option<TextEdit> {
|
|
|
|
let use_tree_list_node = single_use_tree.syntax().parent()?;
|
2019-05-15 12:35:47 +00:00
|
|
|
if single_use_tree.path()?.segment()?.syntax().first_child_or_token()?.kind() == T![self] {
|
2019-07-20 09:58:27 +00:00
|
|
|
let start = use_tree_list_node.prev_sibling_or_token()?.text_range().start();
|
|
|
|
let end = use_tree_list_node.text_range().end();
|
2020-04-24 21:40:41 +00:00
|
|
|
let range = TextRange::new(start, end);
|
2019-10-26 17:07:24 +00:00
|
|
|
return Some(TextEdit::delete(range));
|
2019-03-21 16:05:15 +00:00
|
|
|
}
|
|
|
|
None
|
|
|
|
}
|
|
|
|
|
|
|
|
fn check_struct_shorthand_initialization(
|
|
|
|
acc: &mut Vec<Diagnostic>,
|
2019-03-21 16:21:00 +00:00
|
|
|
file_id: FileId,
|
2019-03-21 16:05:15 +00:00
|
|
|
node: &SyntaxNode,
|
|
|
|
) -> Option<()> {
|
2019-08-23 12:55:21 +00:00
|
|
|
let record_lit = ast::RecordLit::cast(node.clone())?;
|
|
|
|
let record_field_list = record_lit.record_field_list()?;
|
|
|
|
for record_field in record_field_list.fields() {
|
|
|
|
if let (Some(name_ref), Some(expr)) = (record_field.name_ref(), record_field.expr()) {
|
2019-03-21 16:05:15 +00:00
|
|
|
let field_name = name_ref.syntax().text().to_string();
|
|
|
|
let field_expr = expr.syntax().text().to_string();
|
2020-06-12 14:16:19 +00:00
|
|
|
let field_name_is_tup_index = name_ref.as_tuple_field().is_some();
|
2020-06-12 05:11:54 +00:00
|
|
|
if field_name == field_expr && !field_name_is_tup_index {
|
2019-03-21 16:05:15 +00:00
|
|
|
let mut edit_builder = TextEditBuilder::default();
|
2019-08-23 12:55:21 +00:00
|
|
|
edit_builder.delete(record_field.syntax().text_range());
|
|
|
|
edit_builder.insert(record_field.syntax().text_range().start(), field_name);
|
2019-03-21 16:05:15 +00:00
|
|
|
let edit = edit_builder.finish();
|
|
|
|
|
|
|
|
acc.push(Diagnostic {
|
2019-08-23 12:55:21 +00:00
|
|
|
range: record_field.syntax().text_range(),
|
2019-06-04 06:29:50 +00:00
|
|
|
message: "Shorthand struct initialization".to_string(),
|
2019-03-21 16:05:15 +00:00
|
|
|
severity: Severity::WeakWarning,
|
2020-05-22 16:03:08 +00:00
|
|
|
fix: Some(Fix::new(
|
2020-05-05 18:55:12 +00:00
|
|
|
"Use struct shorthand initialization",
|
2020-05-22 16:03:08 +00:00
|
|
|
SourceFileEdit { file_id, edit }.into(),
|
2019-03-24 20:53:41 +00:00
|
|
|
)),
|
2019-03-21 16:05:15 +00:00
|
|
|
});
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
Some(())
|
|
|
|
}
|
|
|
|
|
|
|
|
#[cfg(test)]
|
|
|
|
mod tests {
|
2019-08-29 13:49:10 +00:00
|
|
|
use insta::assert_debug_snapshot;
|
2019-05-28 15:46:11 +00:00
|
|
|
use ra_syntax::SourceFile;
|
2020-06-23 20:27:24 +00:00
|
|
|
use stdx::trim_indent;
|
2019-07-04 20:05:17 +00:00
|
|
|
use test_utils::assert_eq_text;
|
2019-03-25 11:28:04 +00:00
|
|
|
|
2019-08-17 06:12:50 +00:00
|
|
|
use crate::mock_analysis::{analysis_and_position, single_file};
|
2019-03-21 16:05:15 +00:00
|
|
|
|
|
|
|
use super::*;
|
|
|
|
|
2019-03-21 16:21:00 +00:00
|
|
|
type DiagnosticChecker = fn(&mut Vec<Diagnostic>, FileId, &SyntaxNode) -> Option<()>;
|
2019-03-21 16:05:15 +00:00
|
|
|
|
|
|
|
fn check_not_applicable(code: &str, func: DiagnosticChecker) {
|
2019-07-12 16:41:13 +00:00
|
|
|
let parse = SourceFile::parse(code);
|
2019-03-21 16:05:15 +00:00
|
|
|
let mut diagnostics = Vec::new();
|
2019-07-12 16:41:13 +00:00
|
|
|
for node in parse.tree().syntax().descendants() {
|
2019-07-19 09:56:47 +00:00
|
|
|
func(&mut diagnostics, FileId(0), &node);
|
2019-03-21 16:05:15 +00:00
|
|
|
}
|
|
|
|
assert!(diagnostics.is_empty());
|
|
|
|
}
|
|
|
|
|
|
|
|
fn check_apply(before: &str, after: &str, func: DiagnosticChecker) {
|
2019-07-12 16:41:13 +00:00
|
|
|
let parse = SourceFile::parse(before);
|
2019-03-21 16:05:15 +00:00
|
|
|
let mut diagnostics = Vec::new();
|
2019-07-12 16:41:13 +00:00
|
|
|
for node in parse.tree().syntax().descendants() {
|
2019-07-19 09:56:47 +00:00
|
|
|
func(&mut diagnostics, FileId(0), &node);
|
2019-03-21 16:05:15 +00:00
|
|
|
}
|
|
|
|
let diagnostic =
|
|
|
|
diagnostics.pop().unwrap_or_else(|| panic!("no diagnostics for:\n{}\n", before));
|
|
|
|
let mut fix = diagnostic.fix.unwrap();
|
2020-05-22 16:03:08 +00:00
|
|
|
let edit = fix.source_change.source_file_edits.pop().unwrap().edit;
|
2020-05-05 21:48:26 +00:00
|
|
|
let actual = {
|
|
|
|
let mut actual = before.to_string();
|
|
|
|
edit.apply(&mut actual);
|
|
|
|
actual
|
|
|
|
};
|
2019-03-21 16:05:15 +00:00
|
|
|
assert_eq_text!(after, &actual);
|
|
|
|
}
|
|
|
|
|
2019-08-17 06:12:50 +00:00
|
|
|
/// Takes a multi-file input fixture with annotated cursor positions,
|
|
|
|
/// and checks that:
|
|
|
|
/// * a diagnostic is produced
|
|
|
|
/// * this diagnostic touches the input cursor position
|
|
|
|
/// * that the contents of the file containing the cursor match `after` after the diagnostic fix is applied
|
2020-07-01 15:08:45 +00:00
|
|
|
fn check_apply_diagnostic_fix_from_position(ra_fixture: &str, after: &str) {
|
2020-06-23 20:27:24 +00:00
|
|
|
let after = trim_indent(after);
|
|
|
|
|
2020-07-01 15:08:45 +00:00
|
|
|
let (analysis, file_position) = analysis_and_position(ra_fixture);
|
2019-08-17 06:12:50 +00:00
|
|
|
let diagnostic = analysis.diagnostics(file_position.file_id).unwrap().pop().unwrap();
|
2019-08-11 12:25:36 +00:00
|
|
|
let mut fix = diagnostic.fix.unwrap();
|
2020-05-22 16:03:08 +00:00
|
|
|
let edit = fix.source_change.source_file_edits.pop().unwrap().edit;
|
2019-08-17 06:12:50 +00:00
|
|
|
let target_file_contents = analysis.file_text(file_position.file_id).unwrap();
|
2020-05-05 21:48:26 +00:00
|
|
|
let actual = {
|
|
|
|
let mut actual = target_file_contents.to_string();
|
|
|
|
edit.apply(&mut actual);
|
|
|
|
actual
|
|
|
|
};
|
2019-08-17 06:37:37 +00:00
|
|
|
|
|
|
|
assert_eq_text!(&after, &actual);
|
2019-08-17 06:12:50 +00:00
|
|
|
assert!(
|
2019-08-17 06:37:37 +00:00
|
|
|
diagnostic.range.start() <= file_position.offset
|
|
|
|
&& diagnostic.range.end() >= file_position.offset,
|
2020-04-24 21:51:02 +00:00
|
|
|
"diagnostic range {:?} does not touch cursor position {:?}",
|
2019-08-17 06:12:50 +00:00
|
|
|
diagnostic.range,
|
|
|
|
file_position.offset
|
|
|
|
);
|
2019-08-11 12:25:36 +00:00
|
|
|
}
|
|
|
|
|
2020-06-24 09:05:47 +00:00
|
|
|
fn check_apply_diagnostic_fix(ra_fixture_before: &str, ra_fixture_after: &str) {
|
|
|
|
let ra_fixture_after = &trim_indent(ra_fixture_after);
|
|
|
|
let (analysis, file_id) = single_file(ra_fixture_before);
|
|
|
|
let before = analysis.file_text(file_id).unwrap();
|
2019-04-10 21:00:56 +00:00
|
|
|
let diagnostic = analysis.diagnostics(file_id).unwrap().pop().unwrap();
|
|
|
|
let mut fix = diagnostic.fix.unwrap();
|
2020-05-22 16:03:08 +00:00
|
|
|
let edit = fix.source_change.source_file_edits.pop().unwrap().edit;
|
2020-05-05 21:48:26 +00:00
|
|
|
let actual = {
|
|
|
|
let mut actual = before.to_string();
|
|
|
|
edit.apply(&mut actual);
|
|
|
|
actual
|
|
|
|
};
|
2020-06-24 09:05:47 +00:00
|
|
|
assert_eq_text!(ra_fixture_after, &actual);
|
2019-04-10 21:00:56 +00:00
|
|
|
}
|
|
|
|
|
2019-08-17 06:12:50 +00:00
|
|
|
/// Takes a multi-file input fixture with annotated cursor position and checks that no diagnostics
|
|
|
|
/// apply to the file containing the cursor.
|
2020-07-01 15:08:45 +00:00
|
|
|
fn check_no_diagnostic_for_target_file(ra_fixture: &str) {
|
|
|
|
let (analysis, file_position) = analysis_and_position(ra_fixture);
|
2019-08-17 06:12:50 +00:00
|
|
|
let diagnostics = analysis.diagnostics(file_position.file_id).unwrap();
|
2019-08-11 12:25:36 +00:00
|
|
|
assert_eq!(diagnostics.len(), 0);
|
|
|
|
}
|
|
|
|
|
2020-07-01 15:08:45 +00:00
|
|
|
fn check_no_diagnostic(ra_fixture: &str) {
|
|
|
|
let (analysis, file_id) = single_file(ra_fixture);
|
2019-04-10 21:00:56 +00:00
|
|
|
let diagnostics = analysis.diagnostics(file_id).unwrap();
|
2020-03-24 11:40:58 +00:00
|
|
|
assert_eq!(diagnostics.len(), 0, "expected no diagnostic, found one");
|
2019-04-10 21:00:56 +00:00
|
|
|
}
|
|
|
|
|
2019-08-10 15:40:48 +00:00
|
|
|
#[test]
|
|
|
|
fn test_wrap_return_type() {
|
|
|
|
let before = r#"
|
2019-08-11 12:25:36 +00:00
|
|
|
//- /main.rs
|
2020-06-11 15:28:32 +00:00
|
|
|
use core::result::Result::{self, Ok, Err};
|
2019-08-10 15:40:48 +00:00
|
|
|
|
2020-06-11 15:28:32 +00:00
|
|
|
fn div(x: i32, y: i32) -> Result<i32, ()> {
|
2019-08-10 15:40:48 +00:00
|
|
|
if y == 0 {
|
2020-06-11 15:28:32 +00:00
|
|
|
return Err(());
|
2019-08-10 15:40:48 +00:00
|
|
|
}
|
2019-08-17 06:12:50 +00:00
|
|
|
x / y<|>
|
2019-08-10 15:40:48 +00:00
|
|
|
}
|
2020-06-11 14:22:31 +00:00
|
|
|
//- /core/lib.rs
|
2019-08-11 12:25:36 +00:00
|
|
|
pub mod result {
|
|
|
|
pub enum Result<T, E> { Ok(T), Err(E) }
|
2019-08-10 15:40:48 +00:00
|
|
|
}
|
|
|
|
"#;
|
2019-08-17 06:37:37 +00:00
|
|
|
let after = r#"
|
2020-06-11 15:28:32 +00:00
|
|
|
use core::result::Result::{self, Ok, Err};
|
2019-08-17 06:37:37 +00:00
|
|
|
|
2020-06-11 15:28:32 +00:00
|
|
|
fn div(x: i32, y: i32) -> Result<i32, ()> {
|
2019-08-17 06:37:37 +00:00
|
|
|
if y == 0 {
|
2020-06-11 15:28:32 +00:00
|
|
|
return Err(());
|
2019-08-17 06:37:37 +00:00
|
|
|
}
|
|
|
|
Ok(x / y)
|
|
|
|
}
|
|
|
|
"#;
|
2019-08-17 06:12:50 +00:00
|
|
|
check_apply_diagnostic_fix_from_position(before, after);
|
2019-08-10 15:40:48 +00:00
|
|
|
}
|
|
|
|
|
2019-08-11 14:00:37 +00:00
|
|
|
#[test]
|
|
|
|
fn test_wrap_return_type_handles_generic_functions() {
|
|
|
|
let before = r#"
|
|
|
|
//- /main.rs
|
2020-06-11 14:22:31 +00:00
|
|
|
use core::result::Result::{self, Ok, Err};
|
2019-08-11 14:00:37 +00:00
|
|
|
|
2019-08-11 14:03:27 +00:00
|
|
|
fn div<T>(x: T) -> Result<T, i32> {
|
2019-08-11 14:00:37 +00:00
|
|
|
if x == 0 {
|
|
|
|
return Err(7);
|
|
|
|
}
|
2019-08-17 06:12:50 +00:00
|
|
|
<|>x
|
2019-08-11 14:00:37 +00:00
|
|
|
}
|
2020-06-11 14:22:31 +00:00
|
|
|
//- /core/lib.rs
|
2019-08-11 14:00:37 +00:00
|
|
|
pub mod result {
|
|
|
|
pub enum Result<T, E> { Ok(T), Err(E) }
|
|
|
|
}
|
|
|
|
"#;
|
2019-08-17 06:37:37 +00:00
|
|
|
let after = r#"
|
2020-06-11 14:22:31 +00:00
|
|
|
use core::result::Result::{self, Ok, Err};
|
2019-08-17 06:37:37 +00:00
|
|
|
|
|
|
|
fn div<T>(x: T) -> Result<T, i32> {
|
|
|
|
if x == 0 {
|
|
|
|
return Err(7);
|
|
|
|
}
|
|
|
|
Ok(x)
|
|
|
|
}
|
|
|
|
"#;
|
2019-08-17 06:12:50 +00:00
|
|
|
check_apply_diagnostic_fix_from_position(before, after);
|
2019-08-11 14:00:37 +00:00
|
|
|
}
|
|
|
|
|
2019-08-11 12:47:33 +00:00
|
|
|
#[test]
|
|
|
|
fn test_wrap_return_type_handles_type_aliases() {
|
|
|
|
let before = r#"
|
|
|
|
//- /main.rs
|
2020-06-11 15:28:32 +00:00
|
|
|
use core::result::Result::{self, Ok, Err};
|
2019-08-11 12:47:33 +00:00
|
|
|
|
2020-06-11 15:28:32 +00:00
|
|
|
type MyResult<T> = Result<T, ()>;
|
2019-08-11 12:47:33 +00:00
|
|
|
|
|
|
|
fn div(x: i32, y: i32) -> MyResult<i32> {
|
|
|
|
if y == 0 {
|
2020-06-11 15:28:32 +00:00
|
|
|
return Err(());
|
2019-08-11 12:47:33 +00:00
|
|
|
}
|
2019-08-17 06:12:50 +00:00
|
|
|
x <|>/ y
|
2019-08-11 12:47:33 +00:00
|
|
|
}
|
2020-06-11 14:22:31 +00:00
|
|
|
//- /core/lib.rs
|
2019-08-11 12:47:33 +00:00
|
|
|
pub mod result {
|
|
|
|
pub enum Result<T, E> { Ok(T), Err(E) }
|
|
|
|
}
|
|
|
|
"#;
|
2019-08-17 06:37:37 +00:00
|
|
|
let after = r#"
|
2020-06-11 15:28:32 +00:00
|
|
|
use core::result::Result::{self, Ok, Err};
|
2019-08-17 06:37:37 +00:00
|
|
|
|
2020-06-11 15:28:32 +00:00
|
|
|
type MyResult<T> = Result<T, ()>;
|
2020-06-23 20:27:24 +00:00
|
|
|
|
2019-08-17 06:37:37 +00:00
|
|
|
fn div(x: i32, y: i32) -> MyResult<i32> {
|
|
|
|
if y == 0 {
|
2020-06-11 15:28:32 +00:00
|
|
|
return Err(());
|
2019-08-17 06:37:37 +00:00
|
|
|
}
|
|
|
|
Ok(x / y)
|
|
|
|
}
|
|
|
|
"#;
|
2019-08-17 06:12:50 +00:00
|
|
|
check_apply_diagnostic_fix_from_position(before, after);
|
2019-08-11 12:47:33 +00:00
|
|
|
}
|
|
|
|
|
2019-08-10 15:40:48 +00:00
|
|
|
#[test]
|
2019-08-17 05:31:53 +00:00
|
|
|
fn test_wrap_return_type_not_applicable_when_expr_type_does_not_match_ok_type() {
|
2020-07-01 15:08:45 +00:00
|
|
|
check_no_diagnostic_for_target_file(
|
|
|
|
r"
|
2019-08-11 12:25:36 +00:00
|
|
|
//- /main.rs
|
2020-06-11 15:28:32 +00:00
|
|
|
use core::result::Result::{self, Ok, Err};
|
2019-08-11 12:25:36 +00:00
|
|
|
|
2020-06-11 15:28:32 +00:00
|
|
|
fn foo() -> Result<(), i32> {
|
2019-08-17 06:12:50 +00:00
|
|
|
0<|>
|
2019-08-10 15:40:48 +00:00
|
|
|
}
|
2019-08-11 12:25:36 +00:00
|
|
|
|
2020-06-11 15:28:32 +00:00
|
|
|
//- /core/lib.rs
|
2019-08-11 12:25:36 +00:00
|
|
|
pub mod result {
|
|
|
|
pub enum Result<T, E> { Ok(T), Err(E) }
|
|
|
|
}
|
2020-07-01 15:08:45 +00:00
|
|
|
",
|
|
|
|
);
|
2019-08-10 15:40:48 +00:00
|
|
|
}
|
|
|
|
|
2019-08-17 05:31:53 +00:00
|
|
|
#[test]
|
|
|
|
fn test_wrap_return_type_not_applicable_when_return_type_is_not_result() {
|
2020-07-01 15:08:45 +00:00
|
|
|
check_no_diagnostic_for_target_file(
|
|
|
|
r"
|
2019-08-17 05:31:53 +00:00
|
|
|
//- /main.rs
|
2020-06-11 15:28:32 +00:00
|
|
|
use core::result::Result::{self, Ok, Err};
|
2019-08-17 05:31:53 +00:00
|
|
|
|
|
|
|
enum SomeOtherEnum {
|
|
|
|
Ok(i32),
|
|
|
|
Err(String),
|
|
|
|
}
|
|
|
|
|
|
|
|
fn foo() -> SomeOtherEnum {
|
2019-08-17 06:12:50 +00:00
|
|
|
0<|>
|
2019-08-17 05:31:53 +00:00
|
|
|
}
|
|
|
|
|
2020-06-11 15:28:32 +00:00
|
|
|
//- /core/lib.rs
|
2019-08-17 05:31:53 +00:00
|
|
|
pub mod result {
|
|
|
|
pub enum Result<T, E> { Ok(T), Err(E) }
|
|
|
|
}
|
2020-07-01 15:08:45 +00:00
|
|
|
",
|
|
|
|
);
|
2019-08-17 05:31:53 +00:00
|
|
|
}
|
|
|
|
|
2019-04-10 21:00:56 +00:00
|
|
|
#[test]
|
|
|
|
fn test_fill_struct_fields_empty() {
|
|
|
|
let before = r"
|
|
|
|
struct TestStruct {
|
|
|
|
one: i32,
|
|
|
|
two: i64,
|
|
|
|
}
|
|
|
|
|
|
|
|
fn test_fn() {
|
|
|
|
let s = TestStruct{};
|
|
|
|
}
|
|
|
|
";
|
|
|
|
let after = r"
|
|
|
|
struct TestStruct {
|
|
|
|
one: i32,
|
|
|
|
two: i64,
|
|
|
|
}
|
|
|
|
|
|
|
|
fn test_fn() {
|
|
|
|
let s = TestStruct{ one: (), two: ()};
|
|
|
|
}
|
|
|
|
";
|
|
|
|
check_apply_diagnostic_fix(before, after);
|
2020-02-19 16:53:32 +00:00
|
|
|
}
|
|
|
|
|
2020-03-06 14:26:49 +00:00
|
|
|
#[test]
|
|
|
|
fn test_fill_struct_fields_self() {
|
|
|
|
let before = r"
|
|
|
|
struct TestStruct {
|
|
|
|
one: i32,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl TestStruct {
|
|
|
|
fn test_fn() {
|
|
|
|
let s = Self {};
|
|
|
|
}
|
|
|
|
}
|
|
|
|
";
|
|
|
|
let after = r"
|
|
|
|
struct TestStruct {
|
|
|
|
one: i32,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl TestStruct {
|
|
|
|
fn test_fn() {
|
|
|
|
let s = Self { one: ()};
|
|
|
|
}
|
|
|
|
}
|
|
|
|
";
|
|
|
|
check_apply_diagnostic_fix(before, after);
|
|
|
|
}
|
|
|
|
|
2020-02-19 16:53:32 +00:00
|
|
|
#[test]
|
|
|
|
fn test_fill_struct_fields_enum() {
|
|
|
|
let before = r"
|
|
|
|
enum Expr {
|
|
|
|
Bin { lhs: Box<Expr>, rhs: Box<Expr> }
|
|
|
|
}
|
|
|
|
|
|
|
|
impl Expr {
|
|
|
|
fn new_bin(lhs: Box<Expr>, rhs: Box<Expr>) -> Expr {
|
2020-06-24 10:01:17 +00:00
|
|
|
Expr::Bin { }
|
2020-02-19 16:53:32 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
";
|
|
|
|
let after = r"
|
|
|
|
enum Expr {
|
|
|
|
Bin { lhs: Box<Expr>, rhs: Box<Expr> }
|
|
|
|
}
|
|
|
|
|
|
|
|
impl Expr {
|
|
|
|
fn new_bin(lhs: Box<Expr>, rhs: Box<Expr>) -> Expr {
|
2020-06-24 10:01:17 +00:00
|
|
|
Expr::Bin { lhs: (), rhs: () }
|
2020-02-19 16:53:32 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
";
|
|
|
|
check_apply_diagnostic_fix(before, after);
|
2019-04-10 21:00:56 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_fill_struct_fields_partial() {
|
|
|
|
let before = r"
|
|
|
|
struct TestStruct {
|
|
|
|
one: i32,
|
|
|
|
two: i64,
|
|
|
|
}
|
|
|
|
|
|
|
|
fn test_fn() {
|
|
|
|
let s = TestStruct{ two: 2 };
|
|
|
|
}
|
|
|
|
";
|
|
|
|
let after = r"
|
|
|
|
struct TestStruct {
|
|
|
|
one: i32,
|
|
|
|
two: i64,
|
|
|
|
}
|
|
|
|
|
|
|
|
fn test_fn() {
|
|
|
|
let s = TestStruct{ two: 2, one: () };
|
|
|
|
}
|
|
|
|
";
|
|
|
|
check_apply_diagnostic_fix(before, after);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_fill_struct_fields_no_diagnostic() {
|
2020-07-01 15:08:45 +00:00
|
|
|
check_no_diagnostic(
|
|
|
|
r"
|
2019-04-10 21:00:56 +00:00
|
|
|
struct TestStruct {
|
|
|
|
one: i32,
|
|
|
|
two: i64,
|
|
|
|
}
|
2019-05-13 16:39:06 +00:00
|
|
|
|
2019-04-10 21:00:56 +00:00
|
|
|
fn test_fn() {
|
|
|
|
let one = 1;
|
|
|
|
let s = TestStruct{ one, two: 2 };
|
|
|
|
}
|
2020-07-01 15:08:45 +00:00
|
|
|
",
|
|
|
|
);
|
2019-04-10 21:00:56 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_fill_struct_fields_no_diagnostic_on_spread() {
|
2020-07-01 15:08:45 +00:00
|
|
|
check_no_diagnostic(
|
|
|
|
r"
|
2019-04-10 21:00:56 +00:00
|
|
|
struct TestStruct {
|
|
|
|
one: i32,
|
|
|
|
two: i64,
|
|
|
|
}
|
2019-05-13 16:39:06 +00:00
|
|
|
|
2019-04-10 21:00:56 +00:00
|
|
|
fn test_fn() {
|
|
|
|
let one = 1;
|
|
|
|
let s = TestStruct{ ..a };
|
|
|
|
}
|
2020-07-01 15:08:45 +00:00
|
|
|
",
|
|
|
|
);
|
2019-04-10 21:00:56 +00:00
|
|
|
}
|
|
|
|
|
2019-03-25 11:28:04 +00:00
|
|
|
#[test]
|
|
|
|
fn test_unresolved_module_diagnostic() {
|
|
|
|
let (analysis, file_id) = single_file("mod foo;");
|
|
|
|
let diagnostics = analysis.diagnostics(file_id).unwrap();
|
2019-08-29 13:49:10 +00:00
|
|
|
assert_debug_snapshot!(diagnostics, @r###"
|
2019-11-15 09:56:24 +00:00
|
|
|
[
|
|
|
|
Diagnostic {
|
|
|
|
message: "unresolved module",
|
2020-04-24 21:51:02 +00:00
|
|
|
range: 0..8,
|
2020-05-22 16:03:08 +00:00
|
|
|
severity: Error,
|
2019-11-15 09:56:24 +00:00
|
|
|
fix: Some(
|
2020-05-22 16:03:08 +00:00
|
|
|
Fix {
|
2020-05-05 18:55:12 +00:00
|
|
|
label: "Create module",
|
2020-05-22 16:03:08 +00:00
|
|
|
source_change: SourceChange {
|
|
|
|
source_file_edits: [],
|
|
|
|
file_system_edits: [
|
|
|
|
CreateFile {
|
2020-06-16 16:45:58 +00:00
|
|
|
anchor: FileId(
|
|
|
|
1,
|
2020-05-22 16:03:08 +00:00
|
|
|
),
|
2020-06-16 16:45:58 +00:00
|
|
|
dst: "foo.rs",
|
2020-05-22 16:03:08 +00:00
|
|
|
},
|
|
|
|
],
|
|
|
|
is_snippet: false,
|
|
|
|
},
|
2019-11-15 09:56:24 +00:00
|
|
|
},
|
|
|
|
),
|
|
|
|
},
|
|
|
|
]
|
2019-05-23 22:46:23 +00:00
|
|
|
"###);
|
2019-03-25 11:28:04 +00:00
|
|
|
}
|
|
|
|
|
2020-04-17 11:06:02 +00:00
|
|
|
#[test]
|
|
|
|
fn range_mapping_out_of_macros() {
|
|
|
|
let (analysis, file_id) = single_file(
|
|
|
|
r"
|
|
|
|
fn some() {}
|
|
|
|
fn items() {}
|
|
|
|
fn here() {}
|
|
|
|
|
|
|
|
macro_rules! id {
|
|
|
|
($($tt:tt)*) => { $($tt)*};
|
|
|
|
}
|
|
|
|
|
|
|
|
fn main() {
|
|
|
|
let _x = id![Foo { a: 42 }];
|
|
|
|
}
|
|
|
|
|
|
|
|
pub struct Foo {
|
|
|
|
pub a: i32,
|
|
|
|
pub b: i32,
|
|
|
|
}
|
|
|
|
",
|
|
|
|
);
|
|
|
|
let diagnostics = analysis.diagnostics(file_id).unwrap();
|
|
|
|
assert_debug_snapshot!(diagnostics, @r###"
|
|
|
|
[
|
|
|
|
Diagnostic {
|
2020-05-27 16:15:19 +00:00
|
|
|
message: "Missing structure fields:\n- b\n",
|
2020-06-24 09:05:47 +00:00
|
|
|
range: 127..136,
|
2020-05-22 16:03:08 +00:00
|
|
|
severity: Error,
|
2020-04-17 11:06:02 +00:00
|
|
|
fix: Some(
|
2020-05-22 16:03:08 +00:00
|
|
|
Fix {
|
2020-05-05 18:55:12 +00:00
|
|
|
label: "Fill struct fields",
|
2020-05-22 16:03:08 +00:00
|
|
|
source_change: SourceChange {
|
|
|
|
source_file_edits: [
|
|
|
|
SourceFileEdit {
|
|
|
|
file_id: FileId(
|
|
|
|
1,
|
|
|
|
),
|
|
|
|
edit: TextEdit {
|
|
|
|
indels: [
|
|
|
|
Indel {
|
|
|
|
insert: "{a:42, b: ()}",
|
|
|
|
delete: 3..9,
|
|
|
|
},
|
|
|
|
],
|
|
|
|
},
|
2020-04-17 11:06:02 +00:00
|
|
|
},
|
2020-05-22 16:03:08 +00:00
|
|
|
],
|
|
|
|
file_system_edits: [],
|
|
|
|
is_snippet: false,
|
|
|
|
},
|
2020-04-17 11:06:02 +00:00
|
|
|
},
|
|
|
|
),
|
|
|
|
},
|
|
|
|
]
|
|
|
|
"###);
|
|
|
|
}
|
|
|
|
|
2019-03-21 16:05:15 +00:00
|
|
|
#[test]
|
|
|
|
fn test_check_unnecessary_braces_in_use_statement() {
|
|
|
|
check_not_applicable(
|
|
|
|
"
|
|
|
|
use a;
|
|
|
|
use a::{c, d::e};
|
|
|
|
",
|
|
|
|
check_unnecessary_braces_in_use_statement,
|
|
|
|
);
|
|
|
|
check_apply("use {b};", "use b;", check_unnecessary_braces_in_use_statement);
|
|
|
|
check_apply("use a::{c};", "use a::c;", check_unnecessary_braces_in_use_statement);
|
|
|
|
check_apply("use a::{self};", "use a;", check_unnecessary_braces_in_use_statement);
|
|
|
|
check_apply(
|
|
|
|
"use a::{c, d::{e}};",
|
|
|
|
"use a::{c, d::e};",
|
|
|
|
check_unnecessary_braces_in_use_statement,
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_check_struct_shorthand_initialization() {
|
|
|
|
check_not_applicable(
|
|
|
|
r#"
|
|
|
|
struct A {
|
|
|
|
a: &'static str
|
|
|
|
}
|
|
|
|
|
|
|
|
fn main() {
|
|
|
|
A {
|
|
|
|
a: "hello"
|
|
|
|
}
|
|
|
|
}
|
|
|
|
"#,
|
|
|
|
check_struct_shorthand_initialization,
|
|
|
|
);
|
2020-06-12 05:11:54 +00:00
|
|
|
check_not_applicable(
|
|
|
|
r#"
|
|
|
|
struct A(usize);
|
|
|
|
|
|
|
|
fn main() {
|
|
|
|
A {
|
|
|
|
0: 0
|
|
|
|
}
|
|
|
|
}
|
|
|
|
"#,
|
|
|
|
check_struct_shorthand_initialization,
|
|
|
|
);
|
2019-03-21 16:05:15 +00:00
|
|
|
|
|
|
|
check_apply(
|
|
|
|
r#"
|
|
|
|
struct A {
|
|
|
|
a: &'static str
|
|
|
|
}
|
|
|
|
|
|
|
|
fn main() {
|
|
|
|
let a = "haha";
|
|
|
|
A {
|
|
|
|
a: a
|
|
|
|
}
|
|
|
|
}
|
|
|
|
"#,
|
|
|
|
r#"
|
|
|
|
struct A {
|
|
|
|
a: &'static str
|
|
|
|
}
|
|
|
|
|
|
|
|
fn main() {
|
|
|
|
let a = "haha";
|
|
|
|
A {
|
|
|
|
a
|
|
|
|
}
|
|
|
|
}
|
|
|
|
"#,
|
|
|
|
check_struct_shorthand_initialization,
|
|
|
|
);
|
|
|
|
|
|
|
|
check_apply(
|
|
|
|
r#"
|
|
|
|
struct A {
|
|
|
|
a: &'static str,
|
|
|
|
b: &'static str
|
|
|
|
}
|
|
|
|
|
|
|
|
fn main() {
|
|
|
|
let a = "haha";
|
|
|
|
let b = "bb";
|
|
|
|
A {
|
|
|
|
a: a,
|
|
|
|
b
|
|
|
|
}
|
|
|
|
}
|
|
|
|
"#,
|
|
|
|
r#"
|
|
|
|
struct A {
|
|
|
|
a: &'static str,
|
|
|
|
b: &'static str
|
|
|
|
}
|
|
|
|
|
|
|
|
fn main() {
|
|
|
|
let a = "haha";
|
|
|
|
let b = "bb";
|
|
|
|
A {
|
|
|
|
a,
|
|
|
|
b
|
|
|
|
}
|
|
|
|
}
|
|
|
|
"#,
|
|
|
|
check_struct_shorthand_initialization,
|
|
|
|
);
|
|
|
|
}
|
2020-06-09 21:11:16 +00:00
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_add_field_from_usage() {
|
|
|
|
check_apply_diagnostic_fix(
|
|
|
|
r"
|
2020-06-24 09:05:47 +00:00
|
|
|
fn main() {
|
|
|
|
Foo { bar: 3, baz: false};
|
|
|
|
}
|
|
|
|
struct Foo {
|
|
|
|
bar: i32
|
|
|
|
}
|
|
|
|
",
|
2020-06-09 21:11:16 +00:00
|
|
|
r"
|
2020-06-24 09:05:47 +00:00
|
|
|
fn main() {
|
|
|
|
Foo { bar: 3, baz: false};
|
|
|
|
}
|
|
|
|
struct Foo {
|
|
|
|
bar: i32,
|
|
|
|
baz: bool
|
|
|
|
}
|
|
|
|
",
|
2020-06-09 21:11:16 +00:00
|
|
|
)
|
|
|
|
}
|
2019-03-21 16:05:15 +00:00
|
|
|
}
|