diff options
author | Lukas Wirth <[email protected]> | 2021-01-14 17:35:22 +0000 |
---|---|---|
committer | Lukas Wirth <[email protected]> | 2021-01-14 17:35:22 +0000 |
commit | f51457a643b768794092f73add6dda4aecd400a1 (patch) | |
tree | 8deeda89c7709aa69918d24ee4ecd18ea0e179db /crates/ide/src/typing.rs | |
parent | f88f3d688507508ae9528101e13e1c62902467a3 (diff) |
Group file source edits by FileId
Diffstat (limited to 'crates/ide/src/typing.rs')
-rw-r--r-- | crates/ide/src/typing.rs | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/crates/ide/src/typing.rs b/crates/ide/src/typing.rs index 88c905003..b3fc32645 100644 --- a/crates/ide/src/typing.rs +++ b/crates/ide/src/typing.rs | |||
@@ -15,8 +15,11 @@ | |||
15 | 15 | ||
16 | mod on_enter; | 16 | mod on_enter; |
17 | 17 | ||
18 | use ide_db::base_db::{FilePosition, SourceDatabase}; | 18 | use ide_db::{ |
19 | use ide_db::{source_change::SourceFileEdit, RootDatabase}; | 19 | base_db::{FilePosition, SourceDatabase}, |
20 | source_change::SourceFileEdits, | ||
21 | RootDatabase, | ||
22 | }; | ||
20 | use syntax::{ | 23 | use syntax::{ |
21 | algo::find_node_at_offset, | 24 | algo::find_node_at_offset, |
22 | ast::{self, edit::IndentLevel, AstToken}, | 25 | ast::{self, edit::IndentLevel, AstToken}, |
@@ -56,7 +59,7 @@ pub(crate) fn on_char_typed( | |||
56 | let file = &db.parse(position.file_id).tree(); | 59 | let file = &db.parse(position.file_id).tree(); |
57 | assert_eq!(file.syntax().text().char_at(position.offset), Some(char_typed)); | 60 | assert_eq!(file.syntax().text().char_at(position.offset), Some(char_typed)); |
58 | let edit = on_char_typed_inner(file, position.offset, char_typed)?; | 61 | let edit = on_char_typed_inner(file, position.offset, char_typed)?; |
59 | Some(SourceFileEdit { file_id: position.file_id, edit }.into()) | 62 | Some(SourceFileEdits::from_text_edit(position.file_id, edit).into()) |
60 | } | 63 | } |
61 | 64 | ||
62 | fn on_char_typed_inner(file: &SourceFile, offset: TextSize, char_typed: char) -> Option<TextEdit> { | 65 | fn on_char_typed_inner(file: &SourceFile, offset: TextSize, char_typed: char) -> Option<TextEdit> { |