language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-28 04:44:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Phase out SourceFileEdits in favour of a plain HashMap

Browse source
This commit is contained in:
Lukas Wirth 2021-01-14 22:43:36 +01:00
parent e23bfafb32
commit d5095329a1
15 changed files with 181 additions and 216 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -13,7 +13,7 @@ use hir::{
diagnostics::{Diagnostic as _, DiagnosticCode, DiagnosticSinkBuilder},
Semantics,
};
use ide_db::{base_db::SourceDatabase, source_change::SourceFileEdits, RootDatabase};
use ide_db::{base_db::SourceDatabase, RootDatabase};
use itertools::Itertools;
use rustc_hash::FxHashSet;
use syntax::{
@ -219,7 +219,7 @@ fn check_unnecessary_braces_in_use_statement(
Diagnostic::hint(use_range, "Unnecessary braces in use statement".to_string())
.with_fix(Some(Fix::new(
"Remove unnecessary braces",
SourceFileEdits::from_text_edit(file_id, edit).into(),
SourceChange::from_text_edit(file_id, edit),
use_range,
))),
);
@ -264,10 +264,10 @@ mod tests {
.unwrap();
let fix = diagnostic.fix.unwrap();
let actual = {
let file_id = *fix.source_change.source_file_edits.edits.keys().next().unwrap();
let file_id = *fix.source_change.source_file_edits.keys().next().unwrap();
let mut actual = analysis.file_text(file_id).unwrap().to_string();
for edit in fix.source_change.source_file_edits.edits.values() {
for edit in fix.source_change.source_file_edits.values() {
edit.apply(&mut actual);
}
actual
@ -613,9 +613,7 @@ fn test_fn() {
Fix {
label: "Create module",
source_change: SourceChange {
source_file_edits: SourceFileEdits {
edits: {},
},
source_file_edits: {},
file_system_edits: [
CreateFile {
dst: AnchoredPathBuf {