Merge pull request #16 from DeepCodeAI/dev

1.2.11

Author: Arvi3d

CHANGELOG.md

@@ -1,3 +1,13 @@
+## [1.2.11] - 2019-09-16
+1.2.11 - Fix bug with IndexOutOfBound Exception for wrongly positioned suggestion/marker;
+       - Fix bug with multiple analyses processes on project opening.
+
+## [1.2.10] - 2019-09-14
+- Update modes added:
+  * Interactive (on any source file change);
+  * On Save (when source file saved on disk);
+  * On Demand (only if explicitly invoked).
+
 ## [1.2.9] - 2019-09-08
 - Status Bar widget with summary info added; 
 - .dcignore parsing fixed.

DeveloperGuide.md

@@ -19,6 +19,8 @@ See below correspondent `java-client` version requirements:
 | 1.2.5            | 2.0.8       |
 | 1.2.7            | 2.0.12      |
 | 1.2.8            | 2.0.14      |
+| 1.2.10           | 2.0.16      |
+| 1.2.11           | 2.0.17      |
 
 **Important note: For backward compatibility build MUST be run against Intellij Idea 2019.2 instance!**
 - Run `source gradlew buildPlugin`

build.gradle

@@ -7,7 +7,7 @@ plugins {
 
 //group 'org.example'
 
-version '1.2.9'
+version '1.2.11'
 sourceCompatibility = 1.8
 
 repositories {
@@ -33,6 +33,11 @@ patchPluginXml {
     untilBuild 203
 
     changeNotes """
+1.2.11 - Fix bugs and performance optimisation<br>
+1.2.10 - Update modes added:<br>
+          * Interactive (on any source file change);<br>
+          * On Save (when source file saved on disk);<br>
+          * On Demand (only if explicitly invoked).<br>
 1.2.9 - Status Bar widget with summary info added; .dcignore parsing fixed. <br>
 1.2.8 - Improvements: <br>
            * markers for each suggestion are shown in the List and highlighted in Preview <br>
@@ -64,7 +69,7 @@ task runIC_201(type: RunIdeTask){
 
 task runIC_202(type: RunIdeTask){
     jvmArgs '-Xmx2G'
-    ideDirectory 'C:\\Users\\artem\\AppData\\Local\\JetBrains\\Toolbox\\apps\\IDEA-C\\ch-0\\202.6397.94'
+    ideDirectory 'C:\\Users\\artem\\AppData\\Local\\JetBrains\\Toolbox\\apps\\IDEA-C\\ch-0\\202.7319.50'
 }
 
 task runIC_193(type: RunIdeTask){

src/main/java/ai/deepcode/jbplugin/DeepCodeStatusBarWidgetProvider.java

@@ -12,6 +12,15 @@
 
 public class DeepCodeStatusBarWidgetProvider implements StatusBarWidgetProvider {
 
+  public static void updateWidget(@NotNull Project project) {
+    StatusBar statusBar = WindowManager.getInstance().getStatusBar(project);
+    if (statusBar != null) {
+      StatusBarWidget widget = statusBar.getWidget("DeepCodeAnalysisStatus");
+      if (widget instanceof DeepCodeStatusBarWidget)
+        ((DeepCodeStatusBarWidget) widget).update();
+    }
+  }
+
   @Nullable
   @Override
   public StatusBarWidget getWidget(@NotNull Project project) {
@@ -24,7 +33,7 @@ public String getAnchor() {
     return StatusBar.Anchors.before(StatusBar.StandardWidgets.POSITION_PANEL);
   }
 
-  public class DeepCodeStatusBarWidget
+  public static class DeepCodeStatusBarWidget
       implements StatusBarWidget, StatusBarWidget.IconPresentation {
     private final Project project;
     private StatusBar myStatusBar;
@@ -36,7 +45,7 @@ public DeepCodeStatusBarWidget(@NotNull Project project) {
       update();
     }
 
-    public void update() {
+    private void update() {
       myCurrentIcon = DeepCodeUIUtils.getSummaryIcon(project);
       myToolTipText = DeepCodeUIUtils.addErrWarnInfoCounts(project, "DeepCode", true, null);
       if (myStatusBar != null) myStatusBar.updateWidget(ID());

src/main/java/ai/deepcode/jbplugin/actions/DeepCodeIntentionAction.java

@@ -75,7 +75,7 @@ public boolean isAvailable(@NotNull Project project, Editor editor, PsiFile file
     return editor.getEditorKind() != EditorKind.PREVIEW
         // otherwise preview editor will close (no suggestion found) before description entered.
         && file.equals(myPsiFile)
-        && !AnalysisData.getInstance().isUpdateAnalysisInProgress()
+        && AnalysisData.getInstance().isFileInCache(file)
         && AnalysisData.getInstance().getAnalysis(file).stream()
             .flatMap(s -> s.getRanges().stream())
             .map(PDU::toTextRange)

src/main/java/ai/deepcode/jbplugin/annotators/DeepCodeExternalAnnotator.java

@@ -30,35 +30,39 @@ public class DeepCodeExternalAnnotator extends ExternalAnnotator<PsiFile, List<S
 
   private static final Logger LOG = LoggerFactory.getLogger("DeepCode.Annotator");
 
-/*
-  @Nullable
-  @Override
-  public PsiFile collectInformation(@NotNull PsiFile psiFile) {
-    DCLogger.getInstance().info("collectInformation(@NotNull PsiFile psiFile) for " + psiFile);
-    return psiFile;
-  }
+  /*
+    @Nullable
+    @Override
+    public PsiFile collectInformation(@NotNull PsiFile psiFile) {
+      DCLogger.getInstance().info("collectInformation(@NotNull PsiFile psiFile) for " + psiFile);
+      return psiFile;
+    }
 
-*/
+  */
   @Override
   @Nullable
   public PsiFile collectInformation(
       @NotNull PsiFile psiFile, @NotNull Editor editor, boolean hasErrors) {
-    //DCLogger.getInstance().info("collectInformation(@NotNull PsiFile psiFile, @NotNull Editor editor, boolean hasErrors) for " + psiFile);
+    // DCLogger.getInstance().info("collectInformation(@NotNull PsiFile psiFile, @NotNull Editor
+    // editor, boolean hasErrors) for " + psiFile);
     return psiFile;
-    //return collectInformation(psiFile);
+    // return collectInformation(psiFile);
   }
 
   @Nullable
   @Override
   public List<SuggestionForFile> doAnnotate(PsiFile psiFile) {
     if (!DeepCodeUtils.getInstance().isSupportedFileFormat(psiFile)) return Collections.emptyList();
     final long annotatorId = System.currentTimeMillis();
-    DCLogger.getInstance().logInfo("Annotator (" + annotatorId + ") requested for file: " + psiFile.getName());
-    AnalysisData.getInstance().waitForUpdateAnalysisFinish(ProgressManager.getInstance().getProgressIndicator());
+    DCLogger.getInstance()
+        .logInfo("Annotator (" + annotatorId + ") requested for file: " + psiFile.getName());
+    AnalysisData.getInstance()
+        .waitForUpdateAnalysisFinish(psiFile.getProject(), ProgressManager.getInstance().getProgressIndicator());
     ProgressManager.checkCanceled();
     List<SuggestionForFile> suggestions = AnalysisData.getInstance().getAnalysis(psiFile);
-    DCLogger.getInstance().logInfo(
-        "Annotator (" + annotatorId + ") suggestions gotten for file: " + psiFile.getName());
+    DCLogger.getInstance()
+        .logInfo(
+            "Annotator (" + annotatorId + ") suggestions gotten for file: " + psiFile.getName());
     ProgressManager.checkCanceled();
 
     return suggestions;

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

@@ -1,6 +1,8 @@
 package ai.deepcode.jbplugin.core;
 
 import ai.deepcode.javaclient.core.*;
+import ai.deepcode.jbplugin.DeepCodeStatusBarWidgetProvider;
+import com.intellij.psi.PsiFile;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Collection;
@@ -23,6 +25,10 @@ private AnalysisData() {
 
   @Override
   protected void updateUIonFilesRemovalFromCache(@NotNull Collection<Object> files) {
+    PDU.toPsiFiles(files).stream()
+        .map(PsiFile::getProject)
+        .distinct()
+        .forEach(DeepCodeStatusBarWidgetProvider::updateWidget);
     // code from T0D0 already have listener for updates
   }
 }

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

@@ -35,6 +35,11 @@ protected String getFileName(@NotNull Object file) {
     return PDU.toPsiFile(file).getVirtualFile().getName();
   }
 
+  @Override
+  protected Object getProjectOfFile(@NotNull Object file) {
+    return PDU.toPsiFile(file).getProject();
+  }
+
   @Override
   protected String getDirPath(@NotNull Object file) {
     return PDU.toPsiFile(file).getVirtualFile().getParent().getPath();

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

@@ -15,6 +15,14 @@ public static DeepCodeParams getInstance() {
     return INSTANCE;
   }
 
+  public static enum UpdateMode {
+    INTERACTIVE_MODE,
+    ON_SAVE_MODE,
+    MANUAL_MODE
+  }
+
+  private UpdateMode updateMode;
+
   // TODO https://www.jetbrains.org/intellij/sdk/docs/basics/persisting_sensitive_data.html
   private final PropertiesComponent propertiesComponent = PropertiesComponent.getInstance();
 
@@ -35,6 +43,9 @@ private DeepCodeParams() {
       clearLoginParams();
       propertiesComponent.setValue("ideProductName", ideProductName);
     }
+    updateMode =
+        UpdateMode.valueOf(
+            propertiesComponent.getValue("updateMode", UpdateMode.INTERACTIVE_MODE.name()));
   }
 
   @Override
@@ -87,8 +98,16 @@ public void setConsentGiven(@NotNull Object projectO) {
 
   public boolean isFirstStart() {
     boolean result = PropertiesComponent.getInstance().getBoolean("deepcode.isFirstStart", true);
-    if (result)
-      PropertiesComponent.getInstance().setValue("deepcode.isFirstStart", false, true);
+    if (result) PropertiesComponent.getInstance().setValue("deepcode.isFirstStart", false, true);
     return result;
   }
+
+  public UpdateMode getUpdateMode() {
+    return updateMode;
+  }
+
+  public void setUpdateMode(UpdateMode updateMode) {
+    this.updateMode = updateMode;
+    propertiesComponent.setValue("updateMode", updateMode.name());
+  }
 }

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

@@ -21,6 +21,7 @@
  * <b>outside</b> of IDE.
  */
 public class MyBulkFileListener implements BulkFileListener {
+
   @Override
   public void after(@NotNull List<? extends VFileEvent> events) {
     // fixme debug only
@@ -43,20 +44,24 @@ public void after(@NotNull List<? extends VFileEvent> events) {
           // if too many files changed then it's easier to do Bulk Mode full rescan
           BulkMode.set(project);
           // small delay to prevent multiple rescan Background tasks
-          RunUtils.getInstance().rescanInBackgroundCancellableDelayed(project, PDU.DEFAULT_DELAY_SMALL, true);
+          RunUtils.getInstance()
+              .rescanInBackgroundCancellableDelayed(project, PDU.DEFAULT_DELAY_SMALL, true);
         } else {
           for (PsiFile psiFile : filesChangedOrCreated) {
-            RunUtils.getInstance().runInBackgroundCancellable(
-                psiFile,
-                "Analyzing changes in " + psiFile.getName(),
-                (progress) -> {
-                  AnalysisData.getInstance().removeFilesFromCache(Collections.singleton(psiFile));
-                  RunUtils.getInstance().updateCachedAnalysisResults(project, Collections.singleton(psiFile), progress);
-                });
+            RunUtils.getInstance()
+                .runInBackgroundCancellable(
+                    psiFile,
+                    "Analyzing changes in " + psiFile.getName(),
+                    (progress) -> {
+                      AnalysisData.getInstance()
+                          .removeFilesFromCache(Collections.singleton(psiFile));
+                      RunUtils.getInstance()
+                          .updateCachedAnalysisResults(
+                              project, Collections.singleton(psiFile), progress);
+                    });
           }
         }
       }
-      //          });
 
       Set<PsiFile> dcignoreChangedFiles =
           getFilteredFilesByEventTypes(
@@ -68,14 +73,17 @@ public void after(@NotNull List<? extends VFileEvent> events) {
       if (!dcignoreChangedFiles.isEmpty()) {
         BulkMode.set(project);
         for (PsiFile dcignoreFile : dcignoreChangedFiles) {
-          RunUtils.getInstance().runInBackgroundCancellable(
-              dcignoreFile,
-              "Updating ignored files list...",
-              (progress) ->
-                  DeepCodeIgnoreInfoHolder.getInstance().update_dcignoreFileContent(dcignoreFile));
+          RunUtils.getInstance()
+              .runInBackgroundCancellable(
+                  dcignoreFile,
+                  "Updating ignored files list...",
+                  (progress) ->
+                      DeepCodeIgnoreInfoHolder.getInstance()
+                          .update_dcignoreFileContent(dcignoreFile));
         }
         // small delay to prevent multiple rescan Background tasks
-        RunUtils.getInstance().rescanInBackgroundCancellableDelayed(project, PDU.DEFAULT_DELAY_SMALL, true);
+        RunUtils.getInstance()
+            .rescanInBackgroundCancellableDelayed(project, PDU.DEFAULT_DELAY_SMALL, true);
       }
     }
     // fixme debug only
@@ -102,16 +110,22 @@ public void before(@NotNull List<? extends VFileEvent> events) {
         if (filesRemoved.size() > 10) {
           BulkMode.set(project);
           // small delay to prevent multiple rescan Background tasks
-          RunUtils.getInstance().rescanInBackgroundCancellableDelayed(project, PDU.DEFAULT_DELAY_SMALL, true);
+          RunUtils.getInstance()
+              .rescanInBackgroundCancellableDelayed(project, PDU.DEFAULT_DELAY_SMALL, true);
         } else if (!RunUtils.getInstance().isFullRescanRequested(project)) {
-          RunUtils.getInstance().runInBackground(
-              project,
-              "Removing " + filesRemoved.size() + " locally deleted files on server...",
-              (progress) -> {
-                AnalysisData.getInstance().removeFilesFromCache(PDU.toObjects(filesRemoved));
-                RunUtils.getInstance().updateCachedAnalysisResults(
-                    project, Collections.emptyList(), PDU.toObjects(filesRemoved), progress);
-              });
+          RunUtils.getInstance()
+              .runInBackground(
+                  project,
+                  "Removing " + filesRemoved.size() + " locally deleted files on server...",
+                  (progress) -> {
+                    AnalysisData.getInstance().removeFilesFromCache(PDU.toObjects(filesRemoved));
+                    RunUtils.getInstance()
+                        .updateCachedAnalysisResults(
+                            project,
+                            Collections.emptyList(),
+                            PDU.toObjects(filesRemoved),
+                            progress);
+                  });
         }
       }
 
@@ -124,21 +138,34 @@ public void before(@NotNull List<? extends VFileEvent> events) {
       if (!ignoreFilesToRemove.isEmpty()) {
         BulkMode.set(project);
         // small delay to prevent multiple rescan Background tasks
-        RunUtils.getInstance().rescanInBackgroundCancellableDelayed(project, PDU.DEFAULT_DELAY_SMALL, true);
+        RunUtils.getInstance()
+            .rescanInBackgroundCancellableDelayed(project, PDU.DEFAULT_DELAY_SMALL, true);
       }
     }
     DCLogger.getInstance().logInfo("MyBulkFileListener.before ends");
   }
 
+  private Predicate<VFileEvent> getUpdateModeFilter() {
+    switch (DeepCodeParams.getInstance().getUpdateMode()) {
+      case INTERACTIVE_MODE:
+        // to prevent updating files already done by MyPsiTreeChangeAdapter
+        return VFileEvent::isFromRefresh;
+      case ON_SAVE_MODE:
+        return VFileEvent::isFromSave;
+      case MANUAL_MODE:
+        return event -> false;
+    }
+    return event -> false;
+  }
+
   private Set<PsiFile> getFilteredFilesByEventTypes(
       @NotNull Project project,
       @NotNull List<? extends VFileEvent> events,
       @NotNull Predicate<PsiFile> fileFilter,
       @NotNull Class<?>... classesOfEventsToFilter) {
     PsiManager manager = PsiManager.getInstance(project);
     return events.stream()
-        // to prevent updating files already done by MyPsiTreeChangeAdapter
-        .filter(VFileEvent::isFromRefresh)
+        .filter(getUpdateModeFilter())
         .filter(event -> PsiTreeUtil.instanceOf(event, classesOfEventsToFilter))
         .map(VFileEvent::getFile)
         .filter(Objects::nonNull)