From b5772a6f88a3fcddc5799ba2fc2f62f76c18ecdd Mon Sep 17 00:00:00 2001
From: Akash Yadav <itsaky01@gmail.com>
Date: Sun, 28 Aug 2022 09:38:55 +0530
Subject: [PATCH] Reorganized settings.gradle

---
 .../projects/classpath/ClassInfo.kt           |   4 ----
 .../classpath/JarFsClasspathReader.kt         |  13 +++++------
 settings.gradle                               |  22 +++++++++---------
 tests/test-home/.androidide/init/model.jar    | Bin 59879 -> 59879 bytes
 4 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/build-tools/projects/src/main/java/com/itsaky/androidide/projects/classpath/ClassInfo.kt b/build-tools/projects/src/main/java/com/itsaky/androidide/projects/classpath/ClassInfo.kt
index 7573ceacc..c7f017a26 100644
--- a/build-tools/projects/src/main/java/com/itsaky/androidide/projects/classpath/ClassInfo.kt
+++ b/build-tools/projects/src/main/java/com/itsaky/androidide/projects/classpath/ClassInfo.kt
@@ -56,10 +56,6 @@ private constructor(
           name
         }
 
-      if (name == "com.itsaky.androidide.zipfs.ZipCoder") {
-        println()
-      }
-
       val isAnonymous = simpleName.isDigitsOnly()
       val isLocal = simpleName[0].isDigit() && simpleName.contains(Regex("[A-Za-z]"))
       val isInner = !isTopLevel && !isLocal && !isAnonymous
diff --git a/build-tools/projects/src/main/java/com/itsaky/androidide/projects/classpath/JarFsClasspathReader.kt b/build-tools/projects/src/main/java/com/itsaky/androidide/projects/classpath/JarFsClasspathReader.kt
index 8b16519e0..bfddad084 100644
--- a/build-tools/projects/src/main/java/com/itsaky/androidide/projects/classpath/JarFsClasspathReader.kt
+++ b/build-tools/projects/src/main/java/com/itsaky/androidide/projects/classpath/JarFsClasspathReader.kt
@@ -20,7 +20,6 @@ package com.itsaky.androidide.projects.classpath
 import com.google.common.collect.ImmutableSet
 import com.itsaky.androidide.javac.services.fs.CachedJarFileSystem
 import com.itsaky.androidide.javac.services.fs.CachingJarFileSystemProvider
-import com.itsaky.androidide.utils.ILogger
 import java.io.File
 import java.nio.file.FileVisitResult
 import java.nio.file.FileVisitResult.CONTINUE
@@ -48,15 +47,18 @@ class JarFsClasspathReader : IClasspathReader {
           emptySet(),
           Int.MAX_VALUE,
           object : SimpleFileVisitor<Path>() {
-            
-            override fun preVisitDirectory(dir: Path?, attrs: BasicFileAttributes?): FileVisitResult {
+
+            override fun preVisitDirectory(
+              dir: Path?,
+              attrs: BasicFileAttributes?
+            ): FileVisitResult {
               return if (fs.storeJARPackageDir(dir)) {
                 CONTINUE
               } else {
                 SKIP_SUBTREE
               }
             }
-            
+
             override fun visitFile(file: Path, attrs: BasicFileAttributes): FileVisitResult {
               var name = file.pathString
               if (!name.endsWith(".class")) {
@@ -64,9 +66,6 @@ class JarFsClasspathReader : IClasspathReader {
               }
 
               name = name.substringBeforeLast(".class")
-              if (name.length <= 1) {
-                return CONTINUE
-              }
 
               if (name.startsWith('/')) {
                 name = name.substring(1)
diff --git a/settings.gradle b/settings.gradle
index 7703d0ab7..3e7505e20 100755
--- a/settings.gradle
+++ b/settings.gradle
@@ -8,6 +8,7 @@ include ':eventbus-android'
 include ':eventbus-events'
 include ':lexers'
 include ':logger'
+include ':lookup'
 include ':sdk-info'
 include ':shared'
 include ':treeview'
@@ -21,25 +22,24 @@ include ':lsp:java'
 include ':lsp:xml'
 include ':lsp:testing'
 
+include ':build-tools:aaptcompiler'
+include ':build-tools:builder-model-impl'
+include ':build-tools:classfile'
 include ':build-tools:framework-stubs'
+include ':build-tools:fuzzysearch'
 include ':build-tools:google-java-format'
 include ':build-tools:javac'
 include ':build-tools:javac-services'
+include ':build-tools:jaxp'
+include ':build-tools:jdt'
+include ':build-tools:jsonrpc'
+include ':build-tools:layoutlib-api'
+include ':build-tools:projects'
 include ':build-tools:tooling-api'
 include ':build-tools:tooling-api-events'
 include ':build-tools:tooling-api-impl'
 include ':build-tools:tooling-api-model'
+include ':build-tools:tooling-api-testing'
 include ':build-tools:xml-dom'
 include ':build-tools:xml-formatter'
-include ':build-tools:fuzzysearch'
-include ':build-tools:builder-model-impl'
-include ':build-tools:jsonrpc'
-include ':build-tools:projects'
-include ':build-tools:tooling-api-testing'
-include ':lookup'
-include ':build-tools:aaptcompiler'
-include ':build-tools:layoutlib-api'
-include ':build-tools:jaxp'
 include ':build-tools:xml-utils'
-include ':build-tools:jdt'
-include ':build-tools:classfile'
diff --git a/tests/test-home/.androidide/init/model.jar b/tests/test-home/.androidide/init/model.jar
index 08c00a002a24ed249a4a2d148028c998ca992383..1e39d69776617e87c3d6b4932b4b83c697b8b546 100644
GIT binary patch
delta 33
ncmaEUnfdu;X5IjAW)?061`ZB}6LvBidDHJO1L@7>cM5m`xkU>P

delta 33
ncmaEUnfdu;X5IjAW)?061`ZB}yS-8ydDHJO1L@7>cM5m`!QTth