From c913271b2965027953c71a0b8f85a8c7cb802444 Mon Sep 17 00:00:00 2001 From: Laurenz Date: Tue, 21 Mar 2023 12:55:39 +0100 Subject: Fix crash for jump to outdated span --- src/ide/jump.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/ide') diff --git a/src/ide/jump.rs b/src/ide/jump.rs index d123ac06..fc98747c 100644 --- a/src/ide/jump.rs +++ b/src/ide/jump.rs @@ -20,10 +20,10 @@ pub enum Jump { } impl Jump { - fn from_span(world: &dyn World, span: Span) -> Self { + fn from_span(world: &dyn World, span: Span) -> Option { let source = world.source(span.source()); - let node = source.find(span); - Self::Source(source.id(), node.offset()) + let node = source.find(span)?; + Some(Self::Source(source.id(), node.offset())) } } @@ -78,7 +78,7 @@ pub fn jump_from_click( click, ) { let source = world.source(glyph.span.source()); - let node = source.find(glyph.span); + let node = source.find(glyph.span)?; let pos = if node.kind() == SyntaxKind::Text { let range = node.range(); let mut offset = range.start + usize::from(glyph.offset); @@ -99,12 +99,12 @@ pub fn jump_from_click( FrameItem::Shape(shape, span) => { let Geometry::Rect(size) = shape.geometry else { continue }; if is_in_rect(pos, size, click) { - return Some(Jump::from_span(world, *span)); + return Jump::from_span(world, *span); } } FrameItem::Image(_, size, span) if is_in_rect(pos, *size, click) => { - return Some(Jump::from_span(world, *span)); + return Jump::from_span(world, *span); } _ => {} -- cgit v1.2.3