From 3a4e95c43191c02e54d5b002066df41fb7b4c750 Mon Sep 17 00:00:00 2001 From: David Sherret Date: Tue, 12 Jul 2022 21:56:48 -0400 Subject: fix(repl): do not panic for import completions when the import specifier is empty (#15177) --- cli/lsp/completions.rs | 9 ++++++++- cli/tests/integration/repl_tests.rs | 5 +++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/cli/lsp/completions.rs b/cli/lsp/completions.rs index e69df8079..dfa2c612d 100644 --- a/cli/lsp/completions.rs +++ b/cli/lsp/completions.rs @@ -104,9 +104,16 @@ fn to_narrow_lsp_range( column_index: range.end.character, }) .as_byte_index(text_info.range().start); + let start_byte_index = text_info + .loc_to_source_pos(LineAndColumnIndex { + line_index: range.start.line, + column_index: range.start.character, + }) + .as_byte_index(text_info.range().start); let text_bytes = text_info.text_str().as_bytes(); + let is_empty = end_byte_index - 1 == start_byte_index; let has_trailing_quote = - matches!(text_bytes[end_byte_index - 1], b'"' | b'\''); + !is_empty && matches!(text_bytes[end_byte_index - 1], b'"' | b'\''); lsp::Range { start: lsp::Position { line: range.start.line as u32, diff --git a/cli/tests/integration/repl_tests.rs b/cli/tests/integration/repl_tests.rs index 9731aa0aa..e24978876 100644 --- a/cli/tests/integration/repl_tests.rs +++ b/cli/tests/integration/repl_tests.rs @@ -185,6 +185,11 @@ fn pty_complete_imports() { let output = console.read_all_output(); assert_contains!(output, "Hello World"); }); + + // does not panic when tabbing when empty + util::with_pty(&["repl"], |mut console| { + console.write_line("import '\t"); + }); } #[test] -- cgit v1.2.3