diff --git a/fish-rust/src/fish_indent.rs b/fish-rust/src/fish_indent.rs index 8a4ee5cfc..95dd58bea 100755 --- a/fish-rust/src/fish_indent.rs +++ b/fish-rust/src/fish_indent.rs @@ -647,11 +647,11 @@ fn visit_maybe_newlines(&mut self, node: &ast::MaybeNewlines) { // # something // cmd2 // Treat it as gap text. - if node.range().unwrap().length() == 0 { + let Some(range) = node.range() else { return; }; + if range.length() == 0 { return; } let flags = self.gap_text_flags_before_node(node); - let range = node.range().unwrap(); self.current_indent = self.indent(range.start()); let added_newline = self.emit_gap_text_before(range, flags); let mut gap_range = range; diff --git a/tests/checks/indent.fish b/tests/checks/indent.fish index 5368a93c8..9d0c3dbec 100644 --- a/tests/checks/indent.fish +++ b/tests/checks/indent.fish @@ -446,3 +446,6 @@ echo b\|\{ | $fish_indent echo "\'\\\\\x00\'" | string unescape | $fish_indent | string escape # CHECK: \'\\\x00\' + +echo '\"\"\|\x00' | string unescape | $fish_indent | string unescape +# CHECK: |