fix(projects): add null check for simple name while creating ClassInfo (

fixes #1411)
AndroidIDEOfficial · Oct 30, 2023 · 3b28681 · 3b28681
1 parent 9bb932f
commit 3b28681
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/subprojects/projects/src/main/java/com/itsaky/androidide/projects/classpath/ClassInfo.kt b/subprojects/projects/src/main/java/com/itsaky/androidide/projects/classpath/ClassInfo.kt
@@ -37,7 +37,7 @@ private constructor(
   companion object {
 
     @JvmStatic
-    fun create(name: String): ClassInfo {
+    fun create(name: String): ClassInfo? {
       val isTopLevel = name.indexOf('$') == -1
 
       val simpleName =
@@ -49,6 +49,10 @@ private constructor(
           name
         }
 
+      if (simpleName.isBlank()) {
+        return null
+      }
+
       val packageName =
         if (name.contains('.')) {
           name.substringBeforeLast('.')

diff --git a/...s/projects/src/main/java/com/itsaky/androidide/projects/classpath/JarFsClasspathReader.kt b/...s/projects/src/main/java/com/itsaky/androidide/projects/classpath/JarFsClasspathReader.kt
@@ -79,7 +79,9 @@ class JarFsClasspathReader : IClasspathReader {
                 name = name.replace('/', '.')
               }
 
-              builder.add(ClassInfo.create(name))
+              ClassInfo.create(name)?.also {
+                builder.add(it)
+              }
 
               return super.visitFile(file, attrs)
             }

diff --git a/...projects/src/main/java/com/itsaky/androidide/projects/classpath/ZipFileClasspathReader.kt b/...projects/src/main/java/com/itsaky/androidide/projects/classpath/ZipFileClasspathReader.kt
@@ -53,8 +53,10 @@ class ZipFileClasspathReader : IClasspathReader {
           if (name.contains('/')) {
             name = name.replace('/', '.')
           }
-
-          classes.add(ClassInfo.create(name))
+
+          ClassInfo.create(name)?.also { classInfo ->
+            classes.add(classInfo)
+          }
         }
       }
     }