From 92526a5d9f7b2d29475cd21bd7c65f3155373d28 Mon Sep 17 00:00:00 2001
From: Akash Yadav <itsaky01@gmail.com>
Date: Fri, 21 Jan 2022 12:34:03 +0530
Subject: [PATCH] Fix: Do not execute androidide-cleaner during installation if
 JAVA_HOME does not exist

---
 .../java/com/itsaky/androidide/DownloadActivity.java     | 6 ++++--
 .../com/itsaky/lsp/java/visitors/FindCompletionsAt.java  | 9 +++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/itsaky/androidide/DownloadActivity.java b/app/src/main/java/com/itsaky/androidide/DownloadActivity.java
index d6356bacb..fb911a24f 100755
--- a/app/src/main/java/com/itsaky/androidide/DownloadActivity.java
+++ b/app/src/main/java/com/itsaky/androidide/DownloadActivity.java
@@ -208,8 +208,10 @@ public class DownloadActivity extends StudioActivity {
         
         sb.append ("echo 'Cleaning unsupported flags in binaries...'");
         joiner (sb);
-        sb.append ("$BUSYBOX find $JAVA_HOME -type f -exec androidide-cleaner {} \\;");
-        joiner (sb);
+        if (Environment.JAVA_HOME.exists ()) {
+            sb.append ("$BUSYBOX find $JAVA_HOME -type f -exec androidide-cleaner {} \\;");
+            joiner (sb);
+        }
         String DONE = "DONE";
         sb.append ("echo ").append (DONE);
         
diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/visitors/FindCompletionsAt.java b/lsp/java/src/main/java/com/itsaky/lsp/java/visitors/FindCompletionsAt.java
index c36fca149..f58e3fb09 100644
--- a/lsp/java/src/main/java/com/itsaky/lsp/java/visitors/FindCompletionsAt.java
+++ b/lsp/java/src/main/java/com/itsaky/lsp/java/visitors/FindCompletionsAt.java
@@ -17,6 +17,7 @@
 
 package com.itsaky.lsp.java.visitors;
 
+import com.itsaky.androidide.utils.Logger;
 import com.sun.source.tree.CaseTree;
 import com.sun.source.tree.CompilationUnitTree;
 import com.sun.source.tree.ErroneousTree;
@@ -82,6 +83,12 @@ public class FindCompletionsAt extends TreePathScanner<TreePath, Long> {
     @Override
     public TreePath visitCase (CaseTree t, Long find) {
         SourcePositions pos = Trees.instance (task).getSourcePositions ();
+        
+        // default statements have null expression
+//        if (t.getExpression () != null) {
+//
+//        }
+        
         long start = pos.getStartPosition (root, t) + "case".length ();
         long end = pos.getEndPosition (root, t.getExpression ());
         if (start <= find && find <= end) {
@@ -122,4 +129,6 @@ public class FindCompletionsAt extends TreePathScanner<TreePath, Long> {
         }
         return b;
     }
+    
+    private static final Logger LOG = Logger.instance ("FindCompletionsAt");
 }