Skip to content

fix(lsp): align organize imports output with tsgo #32677

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

Open
nayeemrmn wants to merge 1 commit into
base: main
Choose a base branch
from
+161 −303
Open

fix(lsp): align organize imports output with tsgo #32677

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 9 additions & 14 deletions cli/lsp/code_lens.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
use std::cell::RefCell;
use std::collections::HashSet;
use std::rc::Rc;
use std::sync::Arc;

use deno_ast::ParsedSource;
use deno_ast::SourceRange;
Expand Down Expand Up @@ -399,7 +398,7 @@ pub fn collect_test(
pub fn collect_tsc(
uri: &Uri,
code_lens_settings: &CodeLensSettings,
line_index: Arc<LineIndex>,
line_index: &LineIndex,
navigation_tree: &NavigationTree,
token: &CancellationToken,
) -> Result<Vec<lsp::CodeLens>, AnyError> {
Expand All @@ -412,15 +411,15 @@ pub fn collect_tsc(
let source = CodeLensSource::Implementations;
match i.kind {
tsc::ScriptElementKind::InterfaceElement => {
code_lenses.push(i.to_code_lens(line_index.clone(), uri, source));
code_lenses.push(i.to_code_lens(line_index, uri, source));
}
tsc::ScriptElementKind::ClassElement
| tsc::ScriptElementKind::MemberFunctionElement
| tsc::ScriptElementKind::MemberVariableElement
| tsc::ScriptElementKind::MemberGetAccessorElement
| tsc::ScriptElementKind::MemberSetAccessorElement => {
if ABSTRACT_MODIFIER.is_match(&i.kind_modifiers) {
code_lenses.push(i.to_code_lens(line_index.clone(), uri, source));
code_lenses.push(i.to_code_lens(line_index, uri, source));
}
}
_ => (),
Expand All @@ -433,30 +432,30 @@ pub fn collect_tsc(
if let Some(parent) = &mp
&& parent.kind == tsc::ScriptElementKind::EnumElement
{
code_lenses.push(i.to_code_lens(line_index.clone(), uri, source));
code_lenses.push(i.to_code_lens(line_index, uri, source));
}
match i.kind {
tsc::ScriptElementKind::FunctionElement => {
if code_lens_settings.references_all_functions {
code_lenses.push(i.to_code_lens(line_index.clone(), uri, source));
code_lenses.push(i.to_code_lens(line_index, uri, source));
}
}
tsc::ScriptElementKind::ConstElement
| tsc::ScriptElementKind::LetElement
| tsc::ScriptElementKind::VariableElement => {
if EXPORT_MODIFIER.is_match(&i.kind_modifiers) {
code_lenses.push(i.to_code_lens(line_index.clone(), uri, source));
code_lenses.push(i.to_code_lens(line_index, uri, source));
}
}
tsc::ScriptElementKind::ClassElement => {
if i.text != "<class>" {
code_lenses.push(i.to_code_lens(line_index.clone(), uri, source));
code_lenses.push(i.to_code_lens(line_index, uri, source));
}
}
tsc::ScriptElementKind::InterfaceElement
| tsc::ScriptElementKind::TypeElement
| tsc::ScriptElementKind::EnumElement => {
code_lenses.push(i.to_code_lens(line_index.clone(), uri, source));
code_lenses.push(i.to_code_lens(line_index, uri, source));
}
tsc::ScriptElementKind::LocalFunctionElement
| tsc::ScriptElementKind::MemberFunctionElement
Expand All @@ -471,11 +470,7 @@ pub fn collect_tsc(
tsc::ScriptElementKind::ClassElement
| tsc::ScriptElementKind::InterfaceElement
| tsc::ScriptElementKind::TypeElement => {
code_lenses.push(i.to_code_lens(
line_index.clone(),
uri,
source,
));
code_lenses.push(i.to_code_lens(line_index, uri, source));
}
_ => (),
}
Expand Down
75 changes: 32 additions & 43 deletions cli/lsp/ts_server.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ use std::sync::Arc;
use deno_core::anyhow::anyhow;
use deno_core::error::AnyError;
use deno_core::futures::future::Shared;
use deno_core::serde_json::json;
use deno_resolver::deno_json::CompilerOptionsKey;
use indexmap::IndexMap;
use indexmap::IndexSet;
Expand Down Expand Up @@ -269,7 +268,7 @@ impl TsServer {
let code_lenses = crate::lsp::code_lens::collect_tsc(
&module.uri,
settings,
module.line_index.clone(),
&module.line_index,
&navigation_tree,
token,
)?;
Expand Down Expand Up @@ -310,7 +309,7 @@ impl TsServer {
return Err(anyhow!("request cancelled"));
}
item.collect_document_symbols(
module.line_index.clone(),
&module.line_index,
&mut document_symbols,
);
}
Expand Down Expand Up @@ -492,40 +491,35 @@ impl TsServer {
o.contains(&lsp::CodeActionKind::SOURCE_ORGANIZE_IMPORTS)
})
{
let document_has_errors = context.diagnostics.iter().any(|d| {
// Assume diagnostics without a severity are errors
d.severity
.is_none_or(|s| s == lsp::DiagnosticSeverity::ERROR)
});
let organize_imports_edit = ts_server
.organize_imports(
snapshot.clone(),
module,
document_has_errors,
token,
)
.organize_imports(snapshot.clone(), module, token)
.await
.map_err(|err| {
anyhow!(
"Unable to get organize imports edit from TypeScript: {:#}",
err
)
})?;
if !organize_imports_edit.is_empty() {
let changes_with_modules = organize_imports_edit
let text_edits = organize_imports_edit.first().map(|c| {
c.text_changes
.iter()
.map(|c| (c, module))
.collect::<IndexMap<_, _>>();
.map(|c| c.as_text_edit(&module.line_index))
.collect::<Vec<_>>()
});
if let Some(text_edits) = text_edits
&& !text_edits.is_empty()
{
actions.push(lsp::CodeActionOrCommand::CodeAction(
lsp::CodeAction {
title: "Organize imports".to_string(),
title: "Organize Imports".to_string(),
kind: Some(lsp::CodeActionKind::SOURCE_ORGANIZE_IMPORTS),
edit: file_text_changes_to_workspace_edit(
changes_with_modules,
&snapshot,
token,
)?,
data: Some(json!({ "uri": &module.uri})),
edit: Some(lsp::WorkspaceEdit {
changes: Some(
std::iter::once((module.uri.as_ref().clone(), text_edits))
.collect(),
),
..Default::default()
}),
..Default::default()
},
));
Expand Down Expand Up @@ -564,11 +558,9 @@ impl TsServer {
highlights
.into_iter()
.map(|dh| {
dh.to_highlight(module.line_index.clone(), token).map_err(
|err| {
anyhow!("Unable to convert document highlights: {:#}", err)
},
)
dh.to_highlight(&module.line_index, token).map_err(|err| {
anyhow!("Unable to convert document highlights: {:#}", err)
})
})
.collect::<Result<Vec<_>, _>>()
.map(|s| s.into_iter().flatten().collect())
Expand Down Expand Up @@ -691,7 +683,7 @@ impl TsServer {
.map(|completion_info| {
completion_info
.as_completion_response(
module.line_index.clone(),
&module.line_index,
&snapshot
.config
.language_settings_for_specifier(&module.specifier)
Expand Down Expand Up @@ -860,7 +852,7 @@ impl TsServer {
return Err(anyhow!("request cancelled"));
}
Ok(span.to_folding_range(
module.line_index.clone(),
&module.line_index,
module.text.as_bytes(),
snapshot.config.line_folding_only_capable(),
))
Expand Down Expand Up @@ -1112,9 +1104,8 @@ impl TsServer {
token,
)
.await?;
selection_ranges.push(
selection_range.to_selection_range(module.line_index.clone()),
);
selection_ranges
.push(selection_range.to_selection_range(&module.line_index));
}
Ok(Some(selection_ranges))
}
Expand Down Expand Up @@ -1144,7 +1135,7 @@ impl TsServer {
token,
)
.await?
.to_semantic_tokens(module.line_index.clone(), token),
.to_semantic_tokens(&module.line_index, token),
// TODO(nayeemrmn): Fix when tsgo supports semantic tokens.
Self::Go(_) => Ok(Default::default()),
}
Expand Down Expand Up @@ -1184,7 +1175,7 @@ impl TsServer {
token,
)
.await?
.to_semantic_tokens(module.line_index.clone(), token)?,
.to_semantic_tokens(&module.line_index, token)?,
// TODO(nayeemrmn): Fix when tsgo supports semantic tokens.
Self::Go(_) => Default::default(),
};
Expand Down Expand Up @@ -1325,12 +1316,10 @@ impl TsServer {
) -> Result<Option<Vec<lsp::InlayHint>>, AnyError> {
match self {
Self::Js(ts_server) => {
let text_span =
tsc::TextSpan::from_range(range, module.line_index.clone()).map_err(
|err| {
anyhow!("Failed to convert range to tsc text span: {:#}", err)
},
)?;
let text_span = tsc::TextSpan::from_range(range, &module.line_index)
.map_err(|err| {
anyhow!("Failed to convert range to tsc text span: {:#}", err)
})?;
let mut inlay_hints = ts_server
.provide_inlay_hints(snapshot.clone(), module, text_span, token)
.await;
Expand Down
Loading
Loading