From 22e1c7a112832a18509d400841b3d162228372bf Mon Sep 17 00:00:00 2001 From: Ville Penttinen Date: Sun, 24 Mar 2019 22:53:41 +0200 Subject: Add convenience functions to SourceChange for creating single edits --- crates/ra_ide_api/src/diagnostics.rs | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) (limited to 'crates/ra_ide_api/src/diagnostics.rs') diff --git a/crates/ra_ide_api/src/diagnostics.rs b/crates/ra_ide_api/src/diagnostics.rs index b9dc424c6..b0f23773e 100644 --- a/crates/ra_ide_api/src/diagnostics.rs +++ b/crates/ra_ide_api/src/diagnostics.rs @@ -71,12 +71,10 @@ fn check_unnecessary_braces_in_use_statement( range, message: format!("Unnecessary braces in use statement"), severity: Severity::WeakWarning, - fix: Some(SourceChange { - label: "Remove unnecessary braces".to_string(), - source_file_edits: vec![SourceFileEdit { file_id, edit }], - file_system_edits: Vec::new(), - cursor_position: None, - }), + fix: Some(SourceChange::source_edit( + "Remove unnecessary braces", + SourceFileEdit { file_id, edit }, + )), }); } @@ -119,12 +117,10 @@ fn check_struct_shorthand_initialization( range: named_field.syntax().range(), message: format!("Shorthand struct initialization"), severity: Severity::WeakWarning, - fix: Some(SourceChange { - label: "use struct shorthand initialization".to_string(), - source_file_edits: vec![SourceFileEdit { file_id, edit }], - file_system_edits: Vec::new(), - cursor_position: None, - }), + fix: Some(SourceChange::source_edit( + "use struct shorthand initialization", + SourceFileEdit { file_id, edit }, + )), }); } } @@ -144,12 +140,7 @@ fn check_module( Problem::UnresolvedModule { candidate } => { let create_file = FileSystemEdit::CreateFile { source_root, path: candidate.clone() }; - let fix = SourceChange { - label: "create module".to_string(), - source_file_edits: Vec::new(), - file_system_edits: vec![create_file], - cursor_position: None, - }; + let fix = SourceChange::system_edit("create module", create_file); Diagnostic { range: name_node.range(), message: "unresolved module".to_string(), -- cgit v1.2.3