Merge pull request #3 from DeepCodeAI/dev

1.0.1

Author: Arvi3d

CHANGELOG.md

@@ -1,3 +1,6 @@
+## [1.0.1] - 2019-05-22
+- Updated Java-client and added support for Java 8, required for Android Studio
+
 ## [1.0.0] - 2019-05-21
 ### Added
 - First public beta release

build.gradle

@@ -7,7 +7,7 @@ plugins {
 
 //group 'org.example'
 
-version '1.0.0'
+version '1.0.1'
 sourceCompatibility = 1.8
 
 repositories {
@@ -36,6 +36,7 @@ patchPluginXml {
     untilBuild 202
 
     changeNotes """
+      1.0.1 - Updated Java-client and added support for Java 8, required for Android Studio<br>
       1.0.0 - First public beta release.<br>      
     """
 }

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

@@ -109,6 +109,7 @@ static Set<Project> getAllCachedProject() {
   static void removeFilesFromCache(@NotNull Collection<PsiFile> files) {
     try {
       info("Request to remove from cache " + files.size() + " files: " + files);
+      // todo: do we really need mutex here?
       MUTEX.lock();
       int removeCounter = 0;
       for (PsiFile file : files) {
@@ -597,10 +598,8 @@ public static void clearCache(@Nullable final Project project) {
     info("Cache clearance requested for project: " + project);
     mapPsiFile2Hash.clear();
     mapPsiFile2Content.clear();
-    final Project[] projects =
-        (project == null)
-            ? ProjectManager.getInstance().getOpenProjects()
-            : new Project[] {project};
+    final Set<Project> projects =
+        (project == null) ? getAllCachedProject() : Collections.singleton(project);
     for (Project prj : projects) {
       removeProjectFromCache(prj);
       ServiceManager.getService(prj, myTodoView.class).refresh();

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

@@ -53,7 +53,9 @@ private static synchronized void doLogging(String message, Consumer<String> logF
         String s =
             ste.getClassName().substring(ste.getClassName().lastIndexOf('.') + 1)
                 + "."
-                + ste.getMethodName();
+                + ste.getMethodName()
+                + ":"
+                + ste.getLineNumber();
         joiner.add(s);
       }
     }

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

@@ -81,6 +81,7 @@ public void after(@NotNull List<? extends VFileEvent> events) {
   public void before(@NotNull List<? extends VFileEvent> events) {
     DCLogger.info("MyBulkFileListener.before begins");
     for (Project project : AnalysisData.getAllCachedProject()) {
+      if (project.isDisposed()) continue;
       Set<PsiFile> filesRemoved =
           getFilteredFilesByEventTypes(
               project, events, DeepCodeUtils::isSupportedFileFormat, VFileDeleteEvent.class);

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

@@ -33,7 +33,7 @@ public void projectOpened(@NotNull Project project) {
   @Override
   public void projectClosing(@NotNull Project project) {
     // lets all running ProgressIndicators release MUTEX first
-    //RunUtils.cancelRunningIndicators(project);
+    // RunUtils.cancelRunningIndicators(project);
     RunUtils.runInBackground(project, () -> AnalysisData.removeProjectFromCache(project));
   }
 
@@ -43,8 +43,11 @@ public void beforeChildrenChange(@NotNull PsiTreeChangeEvent event) {
       final PsiFile psiFile = event.getFile();
       if (psiFile == null) return;
       if (AnalysisData.isFileInCache(psiFile)) {
-        // immediate delete for visual updates in Panel, annotations, etc.
-        AnalysisData.removeFilesFromCache(Collections.singleton(psiFile));
+        // ?? immediate delete for visual updates in Panel, annotations, etc.
+        // should be done in background to wait MUTEX released in case of currently running update
+        RunUtils.runInBackground(
+            psiFile.getProject(),
+            () -> AnalysisData.removeFilesFromCache(Collections.singleton(psiFile)));
       }
       /*
             if (DeepCodeUtils.isSupportedFileFormat(psiFile)) {

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

@@ -109,7 +109,7 @@ public void run(@NotNull ProgressIndicator indicator) {
   private static final Map<Project, Set<ProgressIndicator>> mapProject2Indicators =
       new ConcurrentHashMap<>();
 
-  private static Set<ProgressIndicator> getRunningIndicators(@NotNull Project project) {
+  private static synchronized Set<ProgressIndicator> getRunningIndicators(@NotNull Project project) {
     return mapProject2Indicators.computeIfAbsent(project, p -> new HashSet<>());
   }
 
@@ -130,17 +130,28 @@ public static void cancelRunningIndicators(@NotNull Project project) {
   private static final Map<VirtualFile, ProgressIndicator> mapFileProcessed2CancellableIndicator =
       new ConcurrentHashMap<>();
 
+  private static final Map<VirtualFile, Runnable> mapFile2Runnable = new ConcurrentHashMap<>();
+
   public static void runInBackgroundCancellable(
       @NotNull PsiFile psiFile, @NotNull Runnable runnable) {
     DCLogger.info("runInBackgroundCancellable requested for: " + psiFile.getName());
+    final VirtualFile virtualFile = psiFile.getVirtualFile();
+
+    // To proceed multiple PSI events in a bunch (every 100 milliseconds)
+    Runnable prevRunnable = mapFile2Runnable.put(virtualFile, runnable);
+    if (prevRunnable != null) return;
+    DCLogger.info("new Background task registered for: " + psiFile.getName());
+
     final Project project = psiFile.getProject();
     ProgressManager.getInstance()
         .run(
             new Task.Backgroundable(project, "DeepCode: Analysing Files...") {
               @Override
               public void run(@NotNull ProgressIndicator indicator) {
+
+                // To let new event cancel the currently running one
                 ProgressIndicator prevProgressIndicator =
-                    mapFileProcessed2CancellableIndicator.put(psiFile.getVirtualFile(), indicator);
+                    mapFileProcessed2CancellableIndicator.put(virtualFile, indicator);
                 if (prevProgressIndicator != null
                     // can't use prevProgressIndicator.isRunning() due to
                     // https://youtrack.jetbrains.com/issue/IDEA-241055
@@ -160,7 +171,13 @@ && getRunningIndicators(project).contains(prevProgressIndicator)) {
                 delay(100);
 
                 DCLogger.info("New Process started for " + psiFile.getName());
-                runnable.run();
+                Runnable actualRunnable = mapFile2Runnable.get(virtualFile);
+                mapFile2Runnable.remove(virtualFile);
+                if (actualRunnable != null) {
+                  actualRunnable.run();
+                } else {
+                  DCLogger.warn("No actual Runnable found for: " + psiFile.getName());
+                }
                 DCLogger.info("Process ending for " + psiFile.getName());
               }
             });