code_action

Author: nayeemrmn

cli/lsp/language_server.rs

@@ -1607,6 +1607,7 @@ impl Inner {
   async fn code_action(
     &self,
     params: CodeActionParams,
+    token: CancellationToken,
   ) -> LspResult<Option<CodeActionResponse>> {
     let specifier = self
       .url_map
@@ -1688,6 +1689,7 @@ impl Inner {
                   &specifier,
                 ),
                 asset_or_doc.scope().cloned(),
+                token.clone(),
               )
               .await;
             for action in actions {
@@ -1794,6 +1796,7 @@ impl Inner {
         params.context.trigger_kind,
         only,
         asset_or_doc.scope().cloned(),
+        token,
       )
       .await?;
     let mut refactor_actions = Vec::<CodeAction>::new();
@@ -3372,7 +3375,12 @@ impl tower_lsp::LanguageServer for LanguageServer {
     if !self.init_flag.is_raised() {
       self.init_flag.wait_raised().await;
     }
-    self.inner.read().await.code_action(params).await
+    let ls = self.clone();
+    self
+      .spawn_with_cancellation(move |token| async move {
+        ls.inner.read().await.code_action(params, token).await
+      })
+      .await
   }
 
   async fn code_action_resolve(

cli/lsp/tsc.rs

@@ -654,6 +654,7 @@ impl TsServer {
     format_code_settings: FormatCodeSettings,
     preferences: UserPreferences,
     scope: Option<ModuleSpecifier>,
+    token: CancellationToken,
   ) -> Vec<CodeFixAction> {
     let req = TscRequest::GetCodeFixesAtPosition(Box::new((
       self.specifier_map.denormalize(&specifier),
@@ -664,7 +665,9 @@ impl TsServer {
       preferences,
     )));
     let result = self
-      .request::<Vec<CodeFixAction>>(snapshot, req, scope)
+      .request_with_cancellation::<Vec<CodeFixAction>>(
+        snapshot, req, scope, token,
+      )
       .await
       .and_then(|mut actions| {
         for action in &mut actions {
@@ -695,6 +698,7 @@ impl TsServer {
     trigger_kind: Option<lsp::CodeActionTriggerKind>,
     only: String,
     scope: Option<ModuleSpecifier>,
+    token: CancellationToken,
   ) -> Result<Vec<ApplicableRefactorInfo>, LspError> {
     let trigger_kind = trigger_kind.map(|reason| match reason {
       lsp::CodeActionTriggerKind::INVOKED => "invoked",
@@ -708,10 +712,13 @@ impl TsServer {
       trigger_kind,
       only,
     )));
-    self.request(snapshot, req, scope).await.map_err(|err| {
-      log::error!("Failed to request to tsserver {}", err);
-      LspError::invalid_request()
-    })
+    self
+      .request_with_cancellation(snapshot, req, scope, token)
+      .await
+      .map_err(|err| {
+        log::error!("Failed to request to tsserver {}", err);
+        LspError::invalid_request()
+      })
   }
 
   pub async fn get_combined_code_fix(