diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-01-15 09:43:08 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2021-01-15 09:43:08 +0000 |
commit | 054e2061521292a72748510f3f6cb7c8b1e8611b (patch) | |
tree | c1660a95eae4aaa57ea5546de0d81678d49f68f1 /crates/ide/src/lib.rs | |
parent | dc48de28d8460903dbfc9454c8cae0e17d62e9c1 (diff) | |
parent | d5095329a1c12e93653d8de4a93f0b4f5cad4c6e (diff) |
Merge #7272
7272: Group file source edits by FileId r=matklad a=Veykril
Co-authored-by: Lukas Wirth <[email protected]>
Diffstat (limited to 'crates/ide/src/lib.rs')
-rw-r--r-- | crates/ide/src/lib.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/ide/src/lib.rs b/crates/ide/src/lib.rs index 1e03832ec..afd552008 100644 --- a/crates/ide/src/lib.rs +++ b/crates/ide/src/lib.rs | |||
@@ -98,7 +98,7 @@ pub use ide_db::{ | |||
98 | label::Label, | 98 | label::Label, |
99 | line_index::{LineCol, LineIndex}, | 99 | line_index::{LineCol, LineIndex}, |
100 | search::SearchScope, | 100 | search::SearchScope, |
101 | source_change::{FileSystemEdit, SourceChange, SourceFileEdit}, | 101 | source_change::{FileSystemEdit, SourceChange}, |
102 | symbol_index::Query, | 102 | symbol_index::Query, |
103 | RootDatabase, | 103 | RootDatabase, |
104 | }; | 104 | }; |
@@ -553,7 +553,7 @@ impl Analysis { | |||
553 | let rule: ssr::SsrRule = query.parse()?; | 553 | let rule: ssr::SsrRule = query.parse()?; |
554 | let mut match_finder = ssr::MatchFinder::in_context(db, resolve_context, selections); | 554 | let mut match_finder = ssr::MatchFinder::in_context(db, resolve_context, selections); |
555 | match_finder.add_rule(rule)?; | 555 | match_finder.add_rule(rule)?; |
556 | let edits = if parse_only { Vec::new() } else { match_finder.edits() }; | 556 | let edits = if parse_only { Default::default() } else { match_finder.edits() }; |
557 | Ok(SourceChange::from(edits)) | 557 | Ok(SourceChange::from(edits)) |
558 | }) | 558 | }) |
559 | } | 559 | } |