1.1.3: Compatible with IntelliJ IDEA 2019.3

Author: Cybr0sis

src/main/java/com/cybrosis/catdea/index/CatdeaIndex.java

@@ -38,7 +38,7 @@
 /**
  * @author cybrosis
  */
-public class CatdeaIndex extends FileBasedIndexExtension<String, Collection<CatdeaIndexEntry>> implements PsiDependentIndex {
+public class CatdeaIndex extends FileBasedIndexExtension<String, Collection<CatdeaIndexEntry>> {
     public static final ID<String, Collection<CatdeaIndexEntry>> INDEX_ID = ID.create("com.cybrosis.catdea.index");
 
     private static final CatdeaIndexer INDEXER = new CatdeaIndexer();
@@ -92,7 +92,7 @@ public void visitLiteralExpression(PsiLiteralExpression expression) {
 
     @Override
     public int getVersion() {
-        return 2;
+        return 3;
     }
 
     @NotNull

src/main/java/com/cybrosis/catdea/index/PsiDataIndexer.java

@@ -20,7 +20,6 @@
 import com.intellij.psi.PsiFile;
 import com.intellij.util.indexing.DataIndexer;
 import com.intellij.util.indexing.FileContent;
-import com.intellij.util.indexing.FileContentImpl;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Map;
@@ -32,11 +31,9 @@ public abstract class PsiDataIndexer<Key, Value> implements DataIndexer<Key, Val
     @NotNull
     @Override
     public Map<Key, Value> map(@NotNull FileContent inputData) {
-        final PsiFile psiFile = ((FileContentImpl) inputData).getPsiFileForPsiDependentIndex();
-
         return DumbService
                 .getInstance(inputData.getProject())
-                .computeWithAlternativeResolveEnabled(() -> map(psiFile));
+                .computeWithAlternativeResolveEnabled(() -> map(inputData.getPsiFile()));
     }
 
     @NotNull

src/main/java/com/cybrosis/catdea/toolWindow/CatdeaToolWindowFactory.java

@@ -16,16 +16,22 @@
 
 package com.cybrosis.catdea.toolWindow;
 
+import com.android.ddmlib.AndroidDebugBridge;
 import com.android.tools.idea.adb.AdbService;
+import com.android.tools.idea.concurrent.EdtExecutor;
 import com.cybrosis.catdea.icons.CatdeaIcons;
-import com.google.common.util.concurrent.MoreExecutors;
+import com.google.common.util.concurrent.FutureCallback;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.ui.Messages;
 import com.intellij.openapi.wm.ToolWindow;
 import com.intellij.openapi.wm.ToolWindowFactory;
 import com.intellij.ui.content.Content;
 import com.intellij.ui.content.ContentManager;
 import org.jetbrains.android.sdk.AndroidSdkUtils;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.io.File;
 
@@ -48,11 +54,18 @@ public void createToolWindowContent(@NotNull Project project, @NotNull ToolWindo
         catdeaLogcatPanel.setLoadingText("Initializing ADB");
         catdeaLogcatPanel.startLoading();
 
-        AdbService.getInstance()
-                .getDebugBridge(adb)
-                .addListener(
-                        catdeaLogcatPanel::stopLoading,
-                        MoreExecutors.directExecutor()
-                );
+        final ListenableFuture<AndroidDebugBridge> future = AdbService.getInstance().getDebugBridge(adb);
+        Futures.addCallback(future, new FutureCallback<AndroidDebugBridge>() {
+            @Override
+            public void onSuccess(@Nullable AndroidDebugBridge bridge) {
+                catdeaLogcatPanel.stopLoading();
+            }
+
+            @Override
+            public void onFailure(@NotNull Throwable t) {
+                catdeaLogcatPanel.stopLoading();
+                Messages.showErrorDialog(AdbService.getDebugBridgeDiagnosticErrorMessage(t, adb), "ADB Connection Error");
+            }
+        }, EdtExecutor.INSTANCE);
     }
 }

src/main/resources/META-INF/plugin.xml

@@ -1,7 +1,7 @@
 <idea-plugin>
     <id>com.cybrosis.catdea</id>
     <name>Catdea</name>
-    <version>1.1.2</version>
+    <version>1.1.3</version>
     <vendor email="[email protected]" url="https://github.com/Cybr0sis/Catdea">Cybrosis</vendor>
 
     <description><![CDATA[
@@ -26,6 +26,7 @@
     ]]></description>
 
     <change-notes><![CDATA[
+      <p>1.1.3: Compatible with IntelliJ IDEA 2019.3</p>
       <p>1.1.2: Fixed icons and minor refactoring</p>
       <p>1.1.1: Fixed issue#4: NPE occurred in CatdeaServiceImpl.projectJdkChanged</p>
       <p>1.1: Added Logcat Monitor Tool Window</p>
@@ -48,6 +49,7 @@
 
         <fileType
                 name="Catdea"
+                language="CatdeaLanguage"
                 implementationClass="com.cybrosis.catdea.files.CatdeaFileType"
                 fieldName="INSTANCE"
                 extensions="log;logcat;logdump"/>