Commit 533d426

committed

fix: Allow merging of multiline duplicate annotations

1 parent 9525c38 commit 533d426Copy full SHA for 533d426

File tree

-5

lines changed

-5

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -213,18 +213,18 @@ impl<'a> SourceMap<'a> {`
`213`	`213`
`214`	`214`	`// Find overlapping multiline annotations, put them at different depths`
`215`	`215`	`multiline_annotations.sort_by_key(\|ml\| (ml.start.line, usize::MAX - ml.end.line));`
`216`		`- for ann in multiline_annotations.clone() {`
	`216`	`+ for (outer_i,ann) in multiline_annotations.clone().into_iter().enumerate() {`
`217`	`217`	`if ann.kind.is_primary() {`
`218`	`218`	`primary_spans.push((ann.start, ann.end));`
`219`	`219`	`}`
`220`		`- for a in &mut multiline_annotations {`
	`220`	`+ for (inner_i, a) in &mut multiline_annotations.iter_mut().enumerate() {`
`221`	`221`	`// Move all other multiline annotations overlapping with this one`
`222`	`222`	`// one level to the right.`
`223`	`223`	`if !ann.same_span(a)`
`224`	`224`	`&& num_overlap(ann.start.line, ann.end.line, a.start.line, a.end.line, true)`
`225`	`225`	`{`
`226`	`226`	`a.increase_depth();`
`227`		`- } else if ann.same_span(a) && &ann != a {`
	`227`	`+ } else if ann.same_span(a) && outer_i != inner_i {`
`228`	`228`	`a.overlaps_exactly = true;`
`229`	`229`	`} else {`
`230`	`230`	`if primary_spans`

Lines changed: 2 additions & 2 deletions

Comments

(0)