language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-03 07:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

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

28
crates/assists/src/assist_context.rs
View file

@ -10,7 +10,7 @@ use ide_db::{
}; };
use ide_db::{ use ide_db::{
label::Label, label::Label,
source_change::{FileSystemEdit, SourceChange, SourceFileEdits}, source_change::{FileSystemEdit, SourceChange},
RootDatabase, RootDatabase,
}; };
use syntax::{ use syntax::{
@ -180,20 +180,12 @@ impl Assists {
pub(crate) struct AssistBuilder { pub(crate) struct AssistBuilder {
edit: TextEditBuilder, edit: TextEditBuilder,
file_id: FileId, file_id: FileId,
is_snippet: bool, source_change: SourceChange,
source_file_edits: SourceFileEdits,
file_system_edits: Vec<FileSystemEdit>,
} }
impl AssistBuilder { impl AssistBuilder {
pub(crate) fn new(file_id: FileId) -> AssistBuilder { pub(crate) fn new(file_id: FileId) -> AssistBuilder {
AssistBuilder { AssistBuilder { edit: TextEdit::builder(), file_id, source_change: SourceChange::default() }
edit: TextEdit::builder(),
file_id,
is_snippet: false,
source_file_edits: SourceFileEdits::default(),
file_system_edits: Vec::default(),
}
} }
pub(crate) fn edit_file(&mut self, file_id: FileId) { pub(crate) fn edit_file(&mut self, file_id: FileId) {
@ -204,7 +196,7 @@ impl AssistBuilder {
fn commit(&mut self) { fn commit(&mut self) {
let edit = mem::take(&mut self.edit).finish(); let edit = mem::take(&mut self.edit).finish();
if !edit.is_empty() { if !edit.is_empty() {
self.source_file_edits.insert(self.file_id, edit); self.source_change.insert_source_edit(self.file_id, edit);
} }
} }
@ -223,7 +215,7 @@ impl AssistBuilder {
offset: TextSize, offset: TextSize,
snippet: impl Into<String>, snippet: impl Into<String>,
) { ) {
self.is_snippet = true; self.source_change.is_snippet = true;
self.insert(offset, snippet); self.insert(offset, snippet);
} }
/// Replaces specified `range` of text with a given string. /// Replaces specified `range` of text with a given string.
@ -237,7 +229,7 @@ impl AssistBuilder {
range: TextRange, range: TextRange,
snippet: impl Into<String>, snippet: impl Into<String>,
) { ) {
self.is_snippet = true; self.source_change.is_snippet = true;
self.replace(range, snippet); self.replace(range, snippet);
} }
pub(crate) fn replace_ast<N: AstNode>(&mut self, old: N, new: N) { pub(crate) fn replace_ast<N: AstNode>(&mut self, old: N, new: N) {
@ -252,15 +244,11 @@ impl AssistBuilder {
pub(crate) fn create_file(&mut self, dst: AnchoredPathBuf, content: impl Into<String>) { pub(crate) fn create_file(&mut self, dst: AnchoredPathBuf, content: impl Into<String>) {
let file_system_edit = let file_system_edit =
FileSystemEdit::CreateFile { dst: dst.clone(), initial_contents: content.into() }; FileSystemEdit::CreateFile { dst: dst.clone(), initial_contents: content.into() };
self.file_system_edits.push(file_system_edit); self.source_change.push_file_system_edit(file_system_edit);
} }
fn finish(mut self) -> SourceChange { fn finish(mut self) -> SourceChange {
self.commit(); self.commit();
SourceChange { mem::take(&mut self.source_change)
source_file_edits: mem::take(&mut self.source_file_edits),
file_system_edits: mem::take(&mut self.file_system_edits),
is_snippet: self.is_snippet,
}
} }
} }

11
crates/assists/src/tests.rs
View file

@ -80,7 +80,7 @@ fn check_doc_test(assist_id: &str, before: &str, after: &str) {
let actual = { let actual = {
let source_change = assist.source_change.unwrap(); let source_change = assist.source_change.unwrap();
let mut actual = before; let mut actual = before;
if let Some(source_file_edit) = source_change.source_file_edits.edits.get(&file_id) { if let Some(source_file_edit) = source_change.get_source_edit(file_id) {
source_file_edit.apply(&mut actual); source_file_edit.apply(&mut actual);
} }
actual actual
@ -120,7 +120,7 @@ fn check(handler: Handler, before: &str, expected: ExpectedResult, assist_label:
&& source_change.file_system_edits.len() == 0; && source_change.file_system_edits.len() == 0;
let mut buf = String::new(); let mut buf = String::new();
for (file_id, edit) in source_change.source_file_edits.edits { for (file_id, edit) in source_change.source_file_edits {
let mut text = db.file_text(file_id).as_ref().to_owned(); let mut text = db.file_text(file_id).as_ref().to_owned();
edit.apply(&mut text); edit.apply(&mut text);
if !skip_header { if !skip_header {
@ -132,9 +132,8 @@ fn check(handler: Handler, before: &str, expected: ExpectedResult, assist_label:
buf.push_str(&text); buf.push_str(&text);
} }
for file_system_edit in source_change.file_system_edits.clone() { for file_system_edit in source_change.file_system_edits {
match file_system_edit { if let FileSystemEdit::CreateFile { dst, initial_contents } = file_system_edit {
FileSystemEdit::CreateFile { dst, initial_contents } => {
let sr = db.file_source_root(dst.anchor); let sr = db.file_source_root(dst.anchor);
let sr = db.source_root(sr); let sr = db.source_root(sr);
let mut base = sr.path_for_file(&dst.anchor).unwrap().clone(); let mut base = sr.path_for_file(&dst.anchor).unwrap().clone();
@ -143,8 +142,6 @@ fn check(handler: Handler, before: &str, expected: ExpectedResult, assist_label:
format_to!(buf, "//- {}\n", created_file_path); format_to!(buf, "//- {}\n", created_file_path);
buf.push_str(&initial_contents); buf.push_str(&initial_contents);
} }
_ => (),
}
} }
assert_eq_text!(after, &buf); assert_eq_text!(after, &buf);

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

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

6
crates/ide/src/diagnostics/field_shorthand.rs
View file

@ -1,7 +1,7 @@
//! Suggests shortening `Foo { field: field }` to `Foo { field }` in both //! Suggests shortening `Foo { field: field }` to `Foo { field }` in both
//! expressions and patterns. //! expressions and patterns.
use ide_db::{base_db::FileId, source_change::SourceFileEdits}; use ide_db::{base_db::FileId, source_change::SourceChange};
use syntax::{ast, match_ast, AstNode, SyntaxNode}; use syntax::{ast, match_ast, AstNode, SyntaxNode};
use text_edit::TextEdit; use text_edit::TextEdit;
@ -49,7 +49,7 @@ fn check_expr_field_shorthand(
Diagnostic::hint(field_range, "Shorthand struct initialization".to_string()).with_fix( Diagnostic::hint(field_range, "Shorthand struct initialization".to_string()).with_fix(
Some(Fix::new( Some(Fix::new(
"Use struct shorthand initialization", "Use struct shorthand initialization",
SourceFileEdits::from_text_edit(file_id, edit).into(), SourceChange::from_text_edit(file_id, edit),
field_range, field_range,
)), )),
), ),
@ -88,7 +88,7 @@ fn check_pat_field_shorthand(
acc.push(Diagnostic::hint(field_range, "Shorthand struct pattern".to_string()).with_fix( acc.push(Diagnostic::hint(field_range, "Shorthand struct pattern".to_string()).with_fix(
Some(Fix::new( Some(Fix::new(
"Use struct field shorthand", "Use struct field shorthand",
SourceFileEdits::from_text_edit(file_id, edit).into(), SourceChange::from_text_edit(file_id, edit),
field_range, field_range,
)), )),
)); ));

18
crates/ide/src/diagnostics/fixes.rs
View file

@ -10,7 +10,7 @@ use hir::{
}; };
use ide_db::{ use ide_db::{
base_db::{AnchoredPathBuf, FileId}, base_db::{AnchoredPathBuf, FileId},
source_change::{FileSystemEdit, SourceFileEdits}, source_change::{FileSystemEdit, SourceChange},
RootDatabase, RootDatabase,
}; };
use syntax::{ use syntax::{
@ -88,7 +88,7 @@ impl DiagnosticWithFix for MissingFields {
}; };
Some(Fix::new( Some(Fix::new(
"Fill struct fields", "Fill struct fields",
SourceFileEdits::from_text_edit(self.file.original_file(sema.db), edit).into(), SourceChange::from_text_edit(self.file.original_file(sema.db), edit),
sema.original_range(&field_list_parent.syntax()).range, sema.original_range(&field_list_parent.syntax()).range,
)) ))
} }
@ -101,8 +101,7 @@ impl DiagnosticWithFix for MissingOkOrSomeInTailExpr {
let tail_expr_range = tail_expr.syntax().text_range(); let tail_expr_range = tail_expr.syntax().text_range();
let replacement = format!("{}({})", self.required, tail_expr.syntax()); let replacement = format!("{}({})", self.required, tail_expr.syntax());
let edit = TextEdit::replace(tail_expr_range, replacement); let edit = TextEdit::replace(tail_expr_range, replacement);
let source_change = let source_change = SourceChange::from_text_edit(self.file.original_file(sema.db), edit);
SourceFileEdits::from_text_edit(self.file.original_file(sema.db), edit).into();
let name = if self.required == "Ok" { "Wrap with Ok" } else { "Wrap with Some" }; let name = if self.required == "Ok" { "Wrap with Ok" } else { "Wrap with Some" };
Some(Fix::new(name, source_change, tail_expr_range)) Some(Fix::new(name, source_change, tail_expr_range))
} }
@ -122,8 +121,7 @@ impl DiagnosticWithFix for RemoveThisSemicolon {
.text_range(); .text_range();
let edit = TextEdit::delete(semicolon); let edit = TextEdit::delete(semicolon);
let source_change = let source_change = SourceChange::from_text_edit(self.file.original_file(sema.db), edit);
SourceFileEdits::from_text_edit(self.file.original_file(sema.db), edit).into();
Some(Fix::new("Remove this semicolon", source_change, semicolon)) Some(Fix::new("Remove this semicolon", source_change, semicolon))
} }
@ -204,15 +202,11 @@ fn missing_record_expr_field_fix(
new_field = format!(",{}", new_field); new_field = format!(",{}", new_field);
} }
let source_change = SourceFileEdits::from_text_edit( let source_change = SourceChange::from_text_edit(
def_file_id, def_file_id,
TextEdit::insert(last_field_syntax.text_range().end(), new_field), TextEdit::insert(last_field_syntax.text_range().end(), new_field),
); );
return Some(Fix::new( return Some(Fix::new("Create field", source_change, record_expr_field.syntax().text_range()));
"Create field",
source_change.into(),
record_expr_field.syntax().text_range(),
));
fn record_field_list(field_def_list: ast::FieldList) -> Option<ast::RecordFieldList> { fn record_field_list(field_def_list: ast::FieldList) -> Option<ast::RecordFieldList> {
match field_def_list { match field_def_list {

2
crates/ide/src/lib.rs
View file

@ -98,7 +98,7 @@ pub use ide_db::{
label::Label, label::Label,
line_index::{LineCol, LineIndex}, line_index::{LineCol, LineIndex},
search::SearchScope, search::SearchScope,
source_change::{FileSystemEdit, SourceChange, SourceFileEdits}, source_change::{FileSystemEdit, SourceChange},
symbol_index::Query, symbol_index::Query,
RootDatabase, RootDatabase,
}; };

65
crates/ide/src/references/rename.rs
View file

@ -21,7 +21,7 @@ use text_edit::TextEdit;
use crate::{ use crate::{
FilePosition, FileSystemEdit, RangeInfo, ReferenceKind, ReferenceSearchResult, SourceChange, FilePosition, FileSystemEdit, RangeInfo, ReferenceKind, ReferenceSearchResult, SourceChange,
SourceFileEdits, TextRange, TextSize, TextRange, TextSize,
}; };
type RenameResult<T> = Result<T, RenameError>; type RenameResult<T> = Result<T, RenameError>;
@ -249,8 +249,8 @@ fn rename_mod(
if IdentifierKind::Ident != check_identifier(new_name)? { if IdentifierKind::Ident != check_identifier(new_name)? {
bail!("Invalid name `{0}`: cannot rename module to {0}", new_name); bail!("Invalid name `{0}`: cannot rename module to {0}", new_name);
} }
let mut source_file_edits = SourceFileEdits::default();
let mut file_system_edits = Vec::new(); let mut source_change = SourceChange::default();
let src = module.definition_source(sema.db); let src = module.definition_source(sema.db);
let file_id = src.file_id.original_file(sema.db); let file_id = src.file_id.original_file(sema.db);
@ -264,7 +264,7 @@ fn rename_mod(
}; };
let dst = AnchoredPathBuf { anchor: file_id, path }; let dst = AnchoredPathBuf { anchor: file_id, path };
let move_file = FileSystemEdit::MoveFile { src: file_id, dst }; let move_file = FileSystemEdit::MoveFile { src: file_id, dst };
file_system_edits.push(move_file); source_change.push_file_system_edit(move_file);
} }
ModuleSource::Module(..) => {} ModuleSource::Module(..) => {}
} }
@ -272,17 +272,19 @@ fn rename_mod(
if let Some(src) = module.declaration_source(sema.db) { if let Some(src) = module.declaration_source(sema.db) {
let file_id = src.file_id.original_file(sema.db); let file_id = src.file_id.original_file(sema.db);
let name = src.value.name().unwrap(); let name = src.value.name().unwrap();
source_file_edits source_change.insert_source_edit(
.insert(file_id, TextEdit::replace(name.syntax().text_range(), new_name.into())); file_id,
TextEdit::replace(name.syntax().text_range(), new_name.into()),
);
} }
let RangeInfo { range, info: refs } = find_all_refs(sema, position)?; let RangeInfo { range, info: refs } = find_all_refs(sema, position)?;
let ref_edits = refs.references().iter().map(|(&file_id, references)| { let ref_edits = refs.references().iter().map(|(&file_id, references)| {
source_edit_from_references(sema, file_id, references, new_name) source_edit_from_references(sema, file_id, references, new_name)
}); });
source_file_edits.extend(ref_edits); source_change.extend(ref_edits);
Ok(RangeInfo::new(range, SourceChange::from_edits(source_file_edits, file_system_edits))) Ok(RangeInfo::new(range, source_change))
} }
fn rename_to_self( fn rename_to_self(
@ -331,13 +333,16 @@ fn rename_to_self(
let RangeInfo { range, info: refs } = find_all_refs(sema, position)?; let RangeInfo { range, info: refs } = find_all_refs(sema, position)?;
let mut edits = SourceFileEdits::default(); let mut source_change = SourceChange::default();
edits.extend(refs.references().iter().map(|(&file_id, references)| { source_change.extend(refs.references().iter().map(|(&file_id, references)| {
source_edit_from_references(sema, file_id, references, "self") source_edit_from_references(sema, file_id, references, "self")
})); }));
edits.insert(position.file_id, TextEdit::replace(param_range, String::from(self_param))); source_change.insert_source_edit(
position.file_id,
TextEdit::replace(param_range, String::from(self_param)),
);
Ok(RangeInfo::new(range, edits.into())) Ok(RangeInfo::new(range, source_change))
} }
fn text_edit_from_self_param( fn text_edit_from_self_param(
@ -391,7 +396,7 @@ fn rename_self_to_param(
.ok_or_else(|| format_err!("No surrounding method declaration found"))?; .ok_or_else(|| format_err!("No surrounding method declaration found"))?;
let search_range = fn_def.syntax().text_range(); let search_range = fn_def.syntax().text_range();
let mut edits = SourceFileEdits::default(); let mut source_change = SourceChange::default();
for (idx, _) in text.match_indices("self") { for (idx, _) in text.match_indices("self") {
let offset: TextSize = idx.try_into().unwrap(); let offset: TextSize = idx.try_into().unwrap();
@ -405,18 +410,18 @@ fn rename_self_to_param(
} else { } else {
TextEdit::replace(usage.text_range(), String::from(new_name)) TextEdit::replace(usage.text_range(), String::from(new_name))
}; };
edits.insert(position.file_id, edit); source_change.insert_source_edit(position.file_id, edit);
} }
} }
if edits.len() > 1 && ident_kind == IdentifierKind::Underscore { if source_change.source_file_edits.len() > 1 && ident_kind == IdentifierKind::Underscore {
bail!("Cannot rename reference to `_` as it is being referenced multiple times"); bail!("Cannot rename reference to `_` as it is being referenced multiple times");
} }
let range = ast::SelfParam::cast(self_token.parent()) let range = ast::SelfParam::cast(self_token.parent())
.map_or(self_token.text_range(), |p| p.syntax().text_range()); .map_or(self_token.text_range(), |p| p.syntax().text_range());
Ok(RangeInfo::new(range, edits.into())) Ok(RangeInfo::new(range, source_change))
} }
fn rename_reference( fn rename_reference(
@ -453,12 +458,12 @@ fn rename_reference(
(IdentifierKind::Ident, _) | (IdentifierKind::Underscore, _) => mark::hit!(rename_ident), (IdentifierKind::Ident, _) | (IdentifierKind::Underscore, _) => mark::hit!(rename_ident),
} }
let mut edits = SourceFileEdits::default(); let mut source_change = SourceChange::default();
edits.extend(refs.into_iter().map(|(file_id, references)| { source_change.extend(refs.into_iter().map(|(file_id, references)| {
source_edit_from_references(sema, file_id, &references, new_name) source_edit_from_references(sema, file_id, &references, new_name)
})); }));
Ok(RangeInfo::new(range, edits.into())) Ok(RangeInfo::new(range, source_change))
} }
#[cfg(test)] #[cfg(test)]
@ -480,7 +485,7 @@ mod tests {
Ok(source_change) => { Ok(source_change) => {
let mut text_edit_builder = TextEdit::builder(); let mut text_edit_builder = TextEdit::builder();
let mut file_id: Option<FileId> = None; let mut file_id: Option<FileId> = None;
for edit in source_change.info.source_file_edits.edits { for edit in source_change.info.source_file_edits {
file_id = Some(edit.0); file_id = Some(edit.0);
for indel in edit.1.into_iter() { for indel in edit.1.into_iter() {
text_edit_builder.replace(indel.delete, indel.insert); text_edit_builder.replace(indel.delete, indel.insert);
@ -882,8 +887,7 @@ mod foo$0;
RangeInfo { RangeInfo {
range: 4..7, range: 4..7,
info: SourceChange { info: SourceChange {
source_file_edits: SourceFileEdits { source_file_edits: {
edits: {
FileId( FileId(
1, 1,
): TextEdit { ): TextEdit {
@ -895,7 +899,6 @@ mod foo$0;
], ],
}, },
}, },
},
file_system_edits: [ file_system_edits: [
MoveFile { MoveFile {
src: FileId( src: FileId(
@ -936,8 +939,7 @@ use crate::foo$0::FooContent;
RangeInfo { RangeInfo {
range: 11..14, range: 11..14,
info: SourceChange { info: SourceChange {
source_file_edits: SourceFileEdits { source_file_edits: {
edits: {
FileId( FileId(
0, 0,
): TextEdit { ): TextEdit {
@ -959,7 +961,6 @@ use crate::foo$0::FooContent;
], ],
}, },
}, },
},
file_system_edits: [ file_system_edits: [
MoveFile { MoveFile {
src: FileId( src: FileId(
@ -994,8 +995,7 @@ mod fo$0o;
RangeInfo { RangeInfo {
range: 4..7, range: 4..7,
info: SourceChange { info: SourceChange {
source_file_edits: SourceFileEdits { source_file_edits: {
edits: {
FileId( FileId(
0, 0,
): TextEdit { ): TextEdit {
@ -1007,7 +1007,6 @@ mod fo$0o;
], ],
}, },
}, },
},
file_system_edits: [ file_system_edits: [
MoveFile { MoveFile {
src: FileId( src: FileId(
@ -1043,8 +1042,7 @@ mod outer { mod fo$0o; }
RangeInfo { RangeInfo {
range: 16..19, range: 16..19,
info: SourceChange { info: SourceChange {
source_file_edits: SourceFileEdits { source_file_edits: {
edits: {
FileId( FileId(
0, 0,
): TextEdit { ): TextEdit {
@ -1056,7 +1054,6 @@ mod outer { mod fo$0o; }
], ],
}, },
}, },
},
file_system_edits: [ file_system_edits: [
MoveFile { MoveFile {
src: FileId( src: FileId(
@ -1115,8 +1112,7 @@ pub mod foo$0;
RangeInfo { RangeInfo {
range: 8..11, range: 8..11,
info: SourceChange { info: SourceChange {
source_file_edits: SourceFileEdits { source_file_edits: {
edits: {
FileId( FileId(
0, 0,
): TextEdit { ): TextEdit {
@ -1138,7 +1134,6 @@ pub mod foo$0;
], ],
}, },
}, },
},
file_system_edits: [ file_system_edits: [
MoveFile { MoveFile {
src: FileId( src: FileId(

3
crates/ide/src/typing.rs
View file

@ -17,7 +17,6 @@ mod on_enter;
use ide_db::{ use ide_db::{
base_db::{FilePosition, SourceDatabase}, base_db::{FilePosition, SourceDatabase},
source_change::SourceFileEdits,
RootDatabase, RootDatabase,
}; };
use syntax::{ use syntax::{
@ -59,7 +58,7 @@ pub(crate) fn on_char_typed(
let file = &db.parse(position.file_id).tree(); let file = &db.parse(position.file_id).tree();
assert_eq!(file.syntax().text().char_at(position.offset), Some(char_typed)); assert_eq!(file.syntax().text().char_at(position.offset), Some(char_typed));
let edit = on_char_typed_inner(file, position.offset, char_typed)?; let edit = on_char_typed_inner(file, position.offset, char_typed)?;
Some(SourceFileEdits::from_text_edit(position.file_id, edit).into()) Some(SourceChange::from_text_edit(position.file_id, edit))
} }
fn on_char_typed_inner(file: &SourceFile, offset: TextSize, char_typed: char) -> Option<TextEdit> { fn on_char_typed_inner(file: &SourceFile, offset: TextSize, char_typed: char) -> Option<TextEdit> {

50
crates/ide_db/src/source_change.rs
View file

@ -10,11 +10,12 @@ use std::{
use base_db::{AnchoredPathBuf, FileId}; use base_db::{AnchoredPathBuf, FileId};
use rustc_hash::FxHashMap; use rustc_hash::FxHashMap;
use stdx::assert_never;
use text_edit::TextEdit; use text_edit::TextEdit;
#[derive(Default, Debug, Clone)] #[derive(Default, Debug, Clone)]
pub struct SourceChange { pub struct SourceChange {
pub source_file_edits: SourceFileEdits, pub source_file_edits: FxHashMap<FileId, TextEdit>,
pub file_system_edits: Vec<FileSystemEdit>, pub file_system_edits: Vec<FileSystemEdit>,
pub is_snippet: bool, pub is_snippet: bool,
} }
@ -23,51 +24,50 @@ impl SourceChange {
/// Creates a new SourceChange with the given label /// Creates a new SourceChange with the given label
/// from the edits. /// from the edits.
pub fn from_edits( pub fn from_edits(
source_file_edits: SourceFileEdits, source_file_edits: FxHashMap<FileId, TextEdit>,
file_system_edits: Vec<FileSystemEdit>, file_system_edits: Vec<FileSystemEdit>,
) -> Self { ) -> Self {
SourceChange { source_file_edits, file_system_edits, is_snippet: false } SourceChange { source_file_edits, file_system_edits, is_snippet: false }
} }
}
#[derive(Default, Debug, Clone)]
pub struct SourceFileEdits {
pub edits: FxHashMap<FileId, TextEdit>,
}
impl SourceFileEdits {
pub fn from_text_edit(file_id: FileId, edit: TextEdit) -> Self { pub fn from_text_edit(file_id: FileId, edit: TextEdit) -> Self {
SourceFileEdits { edits: FxHashMap::from_iter(iter::once((file_id, edit))) } SourceChange {
source_file_edits: FxHashMap::from_iter(iter::once((file_id, edit))),
..Default::default()
}
} }
pub fn len(&self) -> usize { pub fn insert_source_edit(&mut self, file_id: FileId, edit: TextEdit) {
self.edits.len() match self.source_file_edits.entry(file_id) {
}
pub fn is_empty(&self) -> bool {
self.edits.is_empty()
}
pub fn insert(&mut self, file_id: FileId, edit: TextEdit) {
match self.edits.entry(file_id) {
Entry::Occupied(mut entry) => { Entry::Occupied(mut entry) => {
entry.get_mut().union(edit).expect("overlapping edits for same file"); assert_never!(
entry.get_mut().union(edit).is_err(),
"overlapping edits for same file"
);
} }
Entry::Vacant(entry) => { Entry::Vacant(entry) => {
entry.insert(edit); entry.insert(edit);
} }
} }
} }
pub fn push_file_system_edit(&mut self, edit: FileSystemEdit) {
self.file_system_edits.push(edit);
} }
impl Extend<(FileId, TextEdit)> for SourceFileEdits { pub fn get_source_edit(&self, file_id: FileId) -> Option<&TextEdit> {
self.source_file_edits.get(&file_id)
}
}
impl Extend<(FileId, TextEdit)> for SourceChange {
fn extend<T: IntoIterator<Item = (FileId, TextEdit)>>(&mut self, iter: T) { fn extend<T: IntoIterator<Item = (FileId, TextEdit)>>(&mut self, iter: T) {
iter.into_iter().for_each(|(file_id, edit)| self.insert(file_id, edit)); iter.into_iter().for_each(|(file_id, edit)| self.insert_source_edit(file_id, edit));
} }
} }
impl From<SourceFileEdits> for SourceChange { impl From<FxHashMap<FileId, TextEdit>> for SourceChange {
fn from(source_file_edits: SourceFileEdits) -> SourceChange { fn from(source_file_edits: FxHashMap<FileId, TextEdit>) -> SourceChange {
SourceChange { source_file_edits, file_system_edits: Vec::new(), is_snippet: false } SourceChange { source_file_edits, file_system_edits: Vec::new(), is_snippet: false }
} }
} }

2
crates/rust-analyzer/src/cli/ssr.rs
View file

@ -12,7 +12,7 @@ pub fn apply_ssr_rules(rules: Vec<SsrRule>) -> Result<()> {
match_finder.add_rule(rule)?; match_finder.add_rule(rule)?;
} }
let edits = match_finder.edits(); let edits = match_finder.edits();
for (file_id, edit) in edits.edits { for (file_id, edit) in edits {
if let Some(path) = vfs.file_path(file_id).as_path() { if let Some(path) = vfs.file_path(file_id).as_path() {
let mut contents = db.file_text(file_id).to_string(); let mut contents = db.file_text(file_id).to_string();
edit.apply(&mut contents); edit.apply(&mut contents);

10
crates/rust-analyzer/src/handlers.rs
View file

@ -266,7 +266,7 @@ pub(crate) fn handle_on_type_formatting(
}; };
// This should be a single-file edit // This should be a single-file edit
let (_, edit) = edit.source_file_edits.edits.into_iter().next().unwrap(); let (_, edit) = edit.source_file_edits.into_iter().next().unwrap();
let change = to_proto::text_edit_vec(&line_index, line_endings, edit); let change = to_proto::text_edit_vec(&line_index, line_endings, edit);
Ok(Some(change)) Ok(Some(change))
@ -464,12 +464,10 @@ pub(crate) fn handle_will_rename_files(
// Drop file system edits since we're just renaming things on the same level // Drop file system edits since we're just renaming things on the same level
let mut source_changes = source_changes.into_iter(); let mut source_changes = source_changes.into_iter();
let mut source_file_edits = let mut source_change = source_changes.next().unwrap_or_default();
source_changes.next().map_or_else(Default::default, |it| it.source_file_edits); source_change.file_system_edits.clear();
// no collect here because we want to merge text edits on same file ids // no collect here because we want to merge text edits on same file ids
source_file_edits.extend(source_changes.map(|it| it.source_file_edits.edits).flatten()); source_change.extend(source_changes.map(|it| it.source_file_edits).flatten());
let source_change = SourceChange::from_edits(source_file_edits, Vec::new());
let workspace_edit = to_proto::workspace_edit(&snap, source_change)?; let workspace_edit = to_proto::workspace_edit(&snap, source_change)?;
Ok(Some(workspace_edit)) Ok(Some(workspace_edit))
} }

2
crates/rust-analyzer/src/to_proto.rs
View file

@ -698,7 +698,7 @@ pub(crate) fn snippet_workspace_edit(
let ops = snippet_text_document_ops(snap, op); let ops = snippet_text_document_ops(snap, op);
document_changes.extend_from_slice(&ops); document_changes.extend_from_slice(&ops);
} }
for (file_id, edit) in source_change.source_file_edits.edits { for (file_id, edit) in source_change.source_file_edits {
let edit = snippet_text_document_edit(&snap, source_change.is_snippet, file_id, edit)?; let edit = snippet_text_document_edit(&snap, source_change.is_snippet, file_id, edit)?;
document_changes.push(lsp_ext::SnippetDocumentChangeOperation::Edit(edit)); document_changes.push(lsp_ext::SnippetDocumentChangeOperation::Edit(edit));
} }

14
crates/ssr/src/lib.rs
View file

@ -74,13 +74,11 @@ pub use crate::errors::SsrError;
pub use crate::matching::Match; pub use crate::matching::Match;
use crate::matching::MatchFailureReason; use crate::matching::MatchFailureReason;
use hir::Semantics; use hir::Semantics;
use ide_db::{ use ide_db::base_db::{FileId, FilePosition, FileRange};
base_db::{FileId, FilePosition, FileRange},
source_change::SourceFileEdits,
};
use resolving::ResolvedRule; use resolving::ResolvedRule;
use rustc_hash::FxHashMap; use rustc_hash::FxHashMap;
use syntax::{ast, AstNode, SyntaxNode, TextRange}; use syntax::{ast, AstNode, SyntaxNode, TextRange};
use text_edit::TextEdit;
// A structured search replace rule. Create by calling `parse` on a str. // A structured search replace rule. Create by calling `parse` on a str.
#[derive(Debug)] #[derive(Debug)]
@ -161,7 +159,7 @@ impl<'db> MatchFinder<'db> {
} }
/// Finds matches for all added rules and returns edits for all found matches. /// Finds matches for all added rules and returns edits for all found matches.
pub fn edits(&self) -> SourceFileEdits { pub fn edits(&self) -> FxHashMap<FileId, TextEdit> {
use ide_db::base_db::SourceDatabaseExt; use ide_db::base_db::SourceDatabaseExt;
let mut matches_by_file = FxHashMap::default(); let mut matches_by_file = FxHashMap::default();
for m in self.matches().matches { for m in self.matches().matches {
@ -171,8 +169,7 @@ impl<'db> MatchFinder<'db> {
.matches .matches
.push(m); .push(m);
} }
SourceFileEdits { matches_by_file
edits: matches_by_file
.into_iter() .into_iter()
.map(|(file_id, matches)| { .map(|(file_id, matches)| {
( (
@ -184,8 +181,7 @@ impl<'db> MatchFinder<'db> {
), ),
) )
}) })
.collect(), .collect()
}
} }
/// Adds a search pattern. For use if you intend to only call `find_matches_in_file`. If you /// Adds a search pattern. For use if you intend to only call `find_matches_in_file`. If you

2
crates/ssr/src/matching.rs
View file

@ -810,7 +810,7 @@ mod tests {
let edits = match_finder.edits(); let edits = match_finder.edits();
assert_eq!(edits.len(), 1); assert_eq!(edits.len(), 1);
let edit = &edits.edits[&position.file_id]; let edit = &edits[&position.file_id];
let mut after = input.to_string(); let mut after = input.to_string();
edit.apply(&mut after); edit.apply(&mut after);
assert_eq!(after, "fn foo() {} fn bar() {} fn main() { bar(1+2); }"); assert_eq!(after, "fn foo() {} fn bar() {} fn main() { bar(1+2); }");

2
crates/ssr/src/tests.rs
View file

@ -106,7 +106,7 @@ fn assert_ssr_transforms(rules: &[&str], input: &str, expected: Expect) {
// Note, db.file_text is not necessarily the same as `input`, since fixture parsing alters // Note, db.file_text is not necessarily the same as `input`, since fixture parsing alters
// stuff. // stuff.
let mut actual = db.file_text(position.file_id).to_string(); let mut actual = db.file_text(position.file_id).to_string();
edits.edits[&position.file_id].apply(&mut actual); edits[&position.file_id].apply(&mut actual);
expected.assert_eq(&actual); expected.assert_eq(&actual);
} }