diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-11-02 17:47:08 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2020-11-02 17:47:08 +0000 |
commit | 173e45f8724c19e300f2cb3bdabcc37e48a48dc4 (patch) | |
tree | 3b2249b97075bdf2d5256db3a22d6410a276c285 /crates/ide | |
parent | d021dbeb4fa837aa0a6ec65aa9391499d78897e8 (diff) | |
parent | 750ab54573908774d81be82979bc1d328c43c35e (diff) |
Merge #6365
6365: Do insertion lookahead in algo::diff r=matklad a=Veykril
This is the last blocker for #6287 after this I can update that PR to properly fix things through using `SyntaxRewriter`.
This PR also shuffles tests around a bit and adds some more.
Ideally this is just a hack until we implement a "proper" diff algorithm that approximates a minimal diff. Maybe something like [gumtree](https://github.com/GumTreeDiff/gumtree)?
Co-authored-by: Lukas Wirth <[email protected]>
Diffstat (limited to 'crates/ide')
-rw-r--r-- | crates/ide/src/diagnostics.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/ide/src/diagnostics.rs b/crates/ide/src/diagnostics.rs index d0ee58858..1c7f02763 100644 --- a/crates/ide/src/diagnostics.rs +++ b/crates/ide/src/diagnostics.rs | |||
@@ -613,7 +613,7 @@ fn main() { | |||
613 | pub struct Foo { pub a: i32, pub b: i32 } | 613 | pub struct Foo { pub a: i32, pub b: i32 } |
614 | "#, | 614 | "#, |
615 | r#" | 615 | r#" |
616 | fn some(, b: ()} {} | 616 | fn some(, b: ()) {} |
617 | fn items() {} | 617 | fn items() {} |
618 | fn here() {} | 618 | fn here() {} |
619 | 619 | ||