Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(lsp): handle import specifier not having a trailing quote #13074

Merged
merged 3 commits into from
Dec 13, 2021
Merged

fix(lsp): handle import specifier not having a trailing quote #13074

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
05700a0
fix(lsp): handle import specifier not having a trailing quote
dsherret Dec 13, 2021
7f6e8c5
clean up
dsherret Dec 13, 2021
a741ae4
Add test.
dsherret Dec 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 21 additions & 4 deletions cli/lsp/completions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ use super::tsc;
use crate::fs_util::is_supported_ext;
use crate::fs_util::specifier_to_file_path;

use deno_ast::swc::common::BytePos;
use deno_ast::LineAndColumnIndex;
use deno_ast::SourceTextInfo;
use deno_core::normalize_path;
use deno_core::resolve_path;
use deno_core::resolve_url;
Expand Down Expand Up @@ -91,17 +94,31 @@ async fn check_auto_config_registry(
}
}

/// Ranges from the graph for specifiers include the leading and trailing quote,
/// Ranges from the graph for specifiers include the leading and maybe trailing quote,
/// which we want to ignore when replacing text.
fn to_narrow_lsp_range(range: &deno_graph::Range) -> lsp::Range {
fn to_narrow_lsp_range(
text_info: &SourceTextInfo,
range: &deno_graph::Range,
dsherret marked this conversation as resolved.
Show resolved Hide resolved
) -> lsp::Range {
let end_byte_index = text_info.byte_index(LineAndColumnIndex {
line_index: range.end.line,
column_index: range.end.character,
});
let text_bytes = text_info.text_str().as_bytes();
let end_character =
if matches!(text_bytes[end_byte_index.0 as usize - 1], (b'"' | b'\'')) {
range.end.character - 1
} else {
range.end.character
};
lsp::Range {
start: lsp::Position {
line: range.start.line as u32,
character: (range.start.character + 1) as u32,
},
end: lsp::Position {
line: range.end.line as u32,
character: (range.end.character - 1) as u32,
character: end_character as u32,
},
}
}
Expand All @@ -117,7 +134,7 @@ pub(crate) async fn get_import_completions(
) -> Option<lsp::CompletionResponse> {
let document = state_snapshot.documents.get(specifier)?;
let (text, _, range) = document.get_maybe_dependency(position)?;
let range = to_narrow_lsp_range(&range);
let range = to_narrow_lsp_range(&document.text_info(), &range);
// completions for local relative modules
if text.starts_with("./") || text.starts_with("../") {
Some(lsp::CompletionResponse::List(lsp::CompletionList {
Expand Down