nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-02 15:32:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(diagnostics): use default expression instead of todo! when missing fields

Browse Source 
Signed-off-by: Benjamin Coenen <5719034+bnjjj@users.noreply.github.com>
This commit is contained in:
Benjamin Coenen 2022-01-07 14:13:34 +01:00
parent 0a4239a815
commit b60a29ca94
6 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
crates/ide_diagnostics/src/handlers/missing_fields.rs
View File

@ -73,7 +73,7 @@ fn fixes(ctx: &DiagnosticsContext<'_>, d: &hir::MissingFields) -> Option<Vec<Ass
let generate_fill_expr = |ty: &Type| match ctx.config.expr_fill_default {
crate::ExprFillDefaultMode::Todo => Some(make::ext::expr_todo()),
crate::ExprFillDefaultMode::DefaultImpl => {
crate::ExprFillDefaultMode::Default => {
let default_constr = get_default_constructor(ctx, d, ty);
match default_constr {
Some(default_constr) => Some(default_constr),
@ -159,7 +159,6 @@ fn get_default_constructor(
if let AssocItem::Function(func) = assoc_item {
if func.name(ctx.sema.db) == known::new
&& func.assoc_fn_params(ctx.sema.db).is_empty()
&& func.self_param(ctx.sema.db).is_none()
{
return Some(());
}

2
crates/ide_diagnostics/src/lib.rs
View File

@ -132,7 +132,7 @@ pub enum Severity {
#[derive(Clone, Debug, PartialEq, Eq)]
pub enum ExprFillDefaultMode {
Todo,
DefaultImpl,
Default,
}
impl Default for ExprFillDefaultMode {
fn default() -> Self {

2
crates/ide_diagnostics/src/tests.rs
View File

@ -37,7 +37,7 @@ fn check_nth_fix(nth: usize, ra_fixture_before: &str, ra_fixture_after: &str) {
let (db, file_position) = RootDatabase::with_position(ra_fixture_before);
let mut conf = DiagnosticsConfig::default();
conf.expr_fill_default = ExprFillDefaultMode::DefaultImpl;
conf.expr_fill_default = ExprFillDefaultMode::Default;
let diagnostic =
super::diagnostics(&db, &conf, &AssistResolveStrategy::All, file_position.file_id)
.pop()

10
crates/rust-analyzer/src/config.rs
View File

@ -698,7 +698,7 @@ impl Config {
disabled: self.data.diagnostics_disabled.clone(),
expr_fill_default: match self.data.assist_exprFillDefault {
ExprFillDefaultDef::Todo => ExprFillDefaultMode::Todo,
ExprFillDefaultDef::DefaultImpl => ExprFillDefaultMode::DefaultImpl,
ExprFillDefaultDef::Default => ExprFillDefaultMode::Default,
},
}
}
@ -1070,8 +1070,8 @@ enum ManifestOrProjectJson {
pub enum ExprFillDefaultDef {
#[serde(alias = "todo")]
Todo,
#[serde(alias = "defaultImpl")]
DefaultImpl,
#[serde(alias = "default")]
Default,
}
#[derive(Deserialize, Debug, Clone)]
@ -1270,9 +1270,9 @@ fn field_props(field: &str, ty: &str, doc: &[&str], default: &str) -> serde_json
},
"ExprFillDefaultDef" => set! {
"type": "string",
"enum": ["todo", "defaultImpl"],
"enum": ["todo", "default"],
"enumDescriptions": [
"Fill missing elements with 'todo' macro",
"Fill missing expressions with the 'todo' macro",
"Fill missing expressions with reasonable defaults, `new` or `default` constructors."
],
},

2
crates/syntax/src/ast/make.rs
View File

@ -76,7 +76,7 @@ pub mod ext {
expr_from_text(r#""""#)
}
pub fn empty_char() -> ast::Expr {
expr_from_text("''")
expr_from_text("'\x00'")
}
pub fn default_bool() -> ast::Expr {
expr_from_text("false")

6
editors/code/package.json
View File

@ -384,11 +384,11 @@
"type": "string",
"enum": [
"todo",
"defaultImpl"
"default"
],
"enumDescriptions": [
"Fill missing elements with 'todo' macro",
"Fill missing elements with T::default()"
"Fill missing expressions with the 'todo' macro",
"Fill missing expressions with reasonable defaults, `new` or `default` constructors."
]
},
"rust-analyzer.assist.importGranularity": {