fix corner case: Extending a bundle by removing all the parent bundle's files

Author: ArtsiomCh

src/main/java/ai/deepcode/jbplugin/core/AnalysisData.java

@@ -184,11 +184,17 @@ public static void updateCachedResultsForFiles(
               .filter(file -> !mapFile2Suggestions.containsKey(file))
               .collect(Collectors.toSet());
       if (!filesToProceed.isEmpty()) {
-        info("Files to proceed (not found in cache): " + filesToProceed.size());
-        // fixme debug only
         // deepcode ignore checkIsPresent~Optional: collection already checked to be not empty
         final PsiFile firstFile = filesToProceed.stream().findFirst().get();
-        info("Hash for first file " + firstFile.getName() + " [" + getHash(firstFile) + "]");
+        info(
+            "Files to proceed (not found in cache): "
+                + filesToProceed.size()
+                // fixme debug only
+                + "\nHash for first file "
+                + firstFile.getName()
+                + " ["
+                + getHash(firstFile)
+                + "]");
 
         mapFile2Suggestions.putAll(retrieveSuggestions(project, filesToProceed, filesToRemove));
 
@@ -251,10 +257,6 @@ private static Map<PsiFile, List<SuggestionForFile>> retrieveSuggestions(
     info(PREPARE_FILES_TEXT);
     ProgressManager.checkCanceled();
     mapPsiFile2Content.clear();
-    List<String> removedFiles =
-        filesToRemove.stream()
-            .map(DeepCodeUtils::getDeepCodedFilePath)
-            .collect(Collectors.toList());
     Map<String, String> mapPath2Hash = new HashMap<>();
     long sizePath2Hash = 0;
     int fileCounter = 0;
@@ -280,7 +282,7 @@ private static Map<PsiFile, List<SuggestionForFile>> retrieveSuggestions(
       }
     }
     // todo break removeFiles in chunks less then MAX_BANDLE_SIZE
-    CreateBundleResponse createBundleResponse = makeNewBundle(project, mapPath2Hash, removedFiles);
+    CreateBundleResponse createBundleResponse = makeNewBundle(project, mapPath2Hash, filesToRemove);
     if (isNotSucceed(project, createBundleResponse, "Bad Create/Extend Bundle request: "))
       return EMPTY_MAP;
     info(
@@ -362,9 +364,21 @@ private static Map<PsiFile, List<SuggestionForFile>> retrieveSuggestions(
   private static CreateBundleResponse makeNewBundle(
       @NotNull Project project,
       @NotNull Map<String, String> mapPath2Hash,
-      @NotNull List<String> removedFiles) {
+      @NotNull Collection<PsiFile> filesToRemove) {
     final FileHashRequest fileHashRequest = new FileHashRequest(mapPath2Hash);
     final String parentBundleId = mapProject2BundleId.getOrDefault(project, "");
+    if (!parentBundleId.isEmpty()
+        && !filesToRemove.isEmpty()
+        && mapPath2Hash.isEmpty()
+        && filesToRemove.containsAll(cachedFilesOfProject(project))) {
+      warn(
+          "Attempt to Extending a bundle by removing all the parent bundle's files: "
+              + filesToRemove);
+    }
+    List<String> removedFiles =
+        filesToRemove.stream()
+            .map(DeepCodeUtils::getDeepCodedFilePath)
+            .collect(Collectors.toList());
     String message =
         (parentBundleId.isEmpty()
                 ? "Creating new Bundle with "
@@ -385,7 +399,15 @@ private static CreateBundleResponse makeNewBundle(
               parentBundleId,
               new ExtendBundleRequest(fileHashRequest.getFiles(), removedFiles));
     }
-    mapProject2BundleId.put(project, bundleResponse.getBundleId());
+    String newBundleId = bundleResponse.getBundleId();
+    // By man: "Extending a bundle by removing all the parent bundle's files is not allowed."
+    // In reality new bundle returned with next bundleID:
+    // gh/ArtsiomCh/DEEPCODE_PRIVATE_BUNDLE/0000000000000000000000000000000000000000000000000000000000000000
+    if (newBundleId.equals(
+        "gh/ArtsiomCh/DEEPCODE_PRIVATE_BUNDLE/0000000000000000000000000000000000000000000000000000000000000000")) {
+      newBundleId = "";
+    }
+    mapProject2BundleId.put(project, newBundleId);
     return bundleResponse;
   }
 
@@ -513,8 +535,8 @@ private static GetAnalysisResponse doRetrieveSuggestions(
 
   @NotNull
   private static Map<PsiFile, List<SuggestionForFile>> parseGetAnalysisResponse(
-          @NotNull Project project,
-          @NotNull Collection<PsiFile> psiFiles,
+      @NotNull Project project,
+      @NotNull Collection<PsiFile> psiFiles,
       GetAnalysisResponse response,
       @NotNull ProgressIndicator progressIndicator) {
     Map<PsiFile, List<SuggestionForFile>> result = new HashMap<>();