From b2dbe6e43a28a22be2b5d8631dff83b644520f59 Mon Sep 17 00:00:00 2001 From: Phil Ellison Date: Wed, 30 Dec 2020 17:23:00 +0000 Subject: Add fix to wrap return expression in Some --- crates/ide/src/diagnostics/fixes.rs | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'crates/ide/src/diagnostics') diff --git a/crates/ide/src/diagnostics/fixes.rs b/crates/ide/src/diagnostics/fixes.rs index 71ec4df92..50c18d02b 100644 --- a/crates/ide/src/diagnostics/fixes.rs +++ b/crates/ide/src/diagnostics/fixes.rs @@ -3,7 +3,7 @@ use hir::{ db::AstDatabase, diagnostics::{ - Diagnostic, IncorrectCase, MissingFields, MissingOkInTailExpr, NoSuchField, + Diagnostic, IncorrectCase, MissingFields, MissingOkOrSomeInTailExpr, NoSuchField, RemoveThisSemicolon, UnresolvedModule, }, HasSource, HirDisplay, InFile, Semantics, VariantDef, @@ -94,15 +94,16 @@ impl DiagnosticWithFix for MissingFields { } } -impl DiagnosticWithFix for MissingOkInTailExpr { +impl DiagnosticWithFix for MissingOkOrSomeInTailExpr { fn fix(&self, sema: &Semantics) -> Option { let root = sema.db.parse_or_expand(self.file)?; let tail_expr = self.expr.to_node(&root); let tail_expr_range = tail_expr.syntax().text_range(); - let edit = TextEdit::replace(tail_expr_range, format!("Ok({})", tail_expr.syntax())); - let source_change = - SourceFileEdit { file_id: self.file.original_file(sema.db), edit }.into(); - Some(Fix::new("Wrap with ok", source_change, tail_expr_range)) + let replacement = format!("{}({})", self.required, tail_expr.syntax()); + let edit = TextEdit::replace(tail_expr_range, replacement); + let source_change = SourceFileEdit { file_id: self.file.original_file(sema.db), edit }.into(); + let name = if self.required == "Ok" { "Wrap with Ok" } else { "Wrap with Some" }; + Some(Fix::new(name, source_change, tail_expr_range)) } } -- cgit v1.2.3