mirror of
https://gitee.com/zhangsken/AndroidIDE.git
synced 2026-10-16 07:49:44 +08:00
fix(projects): add null check for simple name while creating ClassInfo (fixes #1411)
This commit is contained in:
+5
-1
@@ -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('.')
|
||||
|
||||
+3
-1
@@ -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)
|
||||
}
|
||||
|
||||
+4
-2
@@ -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)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user