Skip to content

Commit bc0fb76

Browse files
committed
plumb token to tsc
1 parent 5c20c03 commit bc0fb76

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

cli/lsp/language_server.rs

+1
Original file line numberDiff line numberDiff line change
@@ -2309,6 +2309,7 @@ impl Inner {
23092309
.options)
23102310
.into(),
23112311
scope.cloned(),
2312+
token.clone(),
23122313
)
23132314
.await
23142315
.unwrap_or_else(|err| {

cli/lsp/tsc.rs

+10-4
Original file line numberDiff line numberDiff line change
@@ -902,6 +902,7 @@ impl TsServer {
902902
options: GetCompletionsAtPositionOptions,
903903
format_code_settings: FormatCodeSettings,
904904
scope: Option<ModuleSpecifier>,
905+
token: CancellationToken,
905906
) -> Result<Option<CompletionInfo>, AnyError> {
906907
let req = TscRequest::GetCompletionsAtPosition(Box::new((
907908
self.specifier_map.denormalize(&specifier),
@@ -910,7 +911,9 @@ impl TsServer {
910911
format_code_settings,
911912
)));
912913
self
913-
.request::<Option<CompletionInfo>>(snapshot, req, scope)
914+
.request_with_cancellation::<Option<CompletionInfo>>(
915+
snapshot, req, scope, token,
916+
)
914917
.await
915918
.map(|mut info| {
916919
if let Some(info) = &mut info {
@@ -3996,9 +3999,10 @@ impl CompletionEntry {
39963999
if let Some(import_data) = &self.auto_import_data {
39974000
let import_mapper =
39984001
language_server.get_ts_response_import_mapper(specifier);
3999-
let maybe_cached = resolution_cache
4000-
.get(&(import_data.normalized.clone(), specifier.clone()))
4001-
.cloned();
4002+
// let maybe_cached = resolution_cache
4003+
// .get(&(import_data.normalized.clone(), specifier.clone()))
4004+
// .cloned();
4005+
let maybe_cached = None;
40024006
if let Some(mut new_specifier) = maybe_cached
40034007
.or_else(|| {
40044008
import_mapper.check_specifier(&import_data.normalized, specifier)
@@ -6211,6 +6215,7 @@ mod tests {
62116215
},
62126216
Default::default(),
62136217
Some(temp_dir.url()),
6218+
Default::default(),
62146219
)
62156220
.await
62166221
.unwrap()
@@ -6404,6 +6409,7 @@ mod tests {
64046409
},
64056410
FormatCodeSettings::from(&fmt_options_config),
64066411
Some(temp_dir.url()),
6412+
Default::default(),
64076413
)
64086414
.await
64096415
.unwrap()

0 commit comments

Comments
 (0)