should be green

Author: kirill-knize-sonarsource

backend/core/src/main/java/org/sonarsource/sonarlint/core/analysis/AnalysisService.java

@@ -791,7 +791,7 @@ private CompletableFuture<AnalysisResult> schedule(String configScopeId, Analyze
       })
       .thenApply(analysisResults -> {
         if (analysisResults == null) {
-          throw new CancellationException("Analysis results should not be null");
+          return null;
         }
         var languagePerFile = analysisResults.languagePerFile().entrySet().stream().collect(HashMap<URI, SonarLanguage>::new,
           (map, entry) -> map.put(entry.getKey().uri(), entry.getValue()), HashMap::putAll);

backend/rpc-impl/src/main/java/org/sonarsource/sonarlint/core/rpc/impl/AnalysisRpcServiceDelegate.java

@@ -19,11 +19,15 @@
  */
 package org.sonarsource.sonarlint.core.rpc.impl;
 
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.CancellationException;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionException;
 import org.eclipse.lsp4j.jsonrpc.ResponseErrorException;
 import org.eclipse.lsp4j.jsonrpc.messages.ResponseError;
+import org.eclipse.lsp4j.jsonrpc.messages.ResponseErrorCode;
 import org.sonarsource.sonarlint.core.analysis.AnalysisResult;
 import org.sonarsource.sonarlint.core.analysis.AnalysisService;
 import org.sonarsource.sonarlint.core.analysis.NodeJsService;
@@ -141,7 +145,18 @@ public CompletableFuture<AnalyzeFilesResponse> analyzeFilesAndTrack(AnalyzeFiles
     return requestFutureAsync(cancelChecker -> getBean(AnalysisService.class)
       .scheduleAnalysis(params.getConfigurationScopeId(), params.getAnalysisId(), Set.copyOf(params.getFilesToAnalyze()),
         params.getExtraProperties(), params.isShouldFetchServerIssues(), TriggerType.FORCED_WITH_EXCLUSIONS, cancelChecker)
-      .thenApply(AnalysisRpcServiceDelegate::generateAnalyzeFilesResponse), configurationScopeId);
+      .exceptionally(exception -> {
+        if (exception instanceof CompletionException || exception instanceof CancellationException) {
+          throw new ResponseErrorException(new ResponseError(ResponseErrorCode.RequestCancelled, "Analysis was cancelled", null));
+        }
+         return null;
+      })
+      .thenApply(analysisResults -> {
+        if (analysisResults == null) {
+          throw new ResponseErrorException(new ResponseError(ResponseErrorCode.RequestCancelled, "Analysis was cancelled", null));
+        }
+        return generateAnalyzeFilesResponse(analysisResults);
+      }), configurationScopeId);
   }
 
   @Override