]> git.lizzy.rs Git - rust.git/commit
projects / rust.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: da15d92 332dd6a)
Auto merge of #13871 - lowr:fix/extract-module-merge-multiple-ranges, r=lnicola
authorbors <bors@rust-lang.org>
Sat, 31 Dec 2022 14:51:27 +0000 (14:51 +0000)
committerbors <bors@rust-lang.org>
Sat, 31 Dec 2022 14:51:27 +0000 (14:51 +0000)
commitf31733b1d61dd8ab2012bbe466838be244a96dd3
tree8ff20bc95b065992ae49e368e72da50832765801tree | snapshot
parentda15d92a3204da419bad70cbfceb2676bfe0b528commit | diff
parent332dd6ad6ec0992137f515845ae832fb807123e8commit | diff
Auto merge of #13871 - lowr:fix/extract-module-merge-multiple-ranges, r=lnicola

fix: merge multiple intersecting ranges

Fixes #13791

In `check_intersection_and_push()`, there may exist two ranges we should merge with the new one. We've been assuming there should be only one range that intersects, which lead to [this assertion](https://github.com/rust-lang/rust-analyzer/blob/da15d92a3204da419bad70cbfceb2676bfe0b528/crates/text-edit/src/lib.rs#L192) to fail under specific circumstances.
Empowering everyone to build reliable and efficient software.