azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AA: fail-safe binary root lookup

Browse Source
This commit is contained in:
Jinseong Jeon
2022-06-02 22:54:02 -07:00
committed by Ilya Kirillov
parent c1b2469e51
commit 5c147c1ded
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/analysis-api-standalone/analysis-api-standalone-base/src/org/jetbrains/kotlin/analysis/api/standalone/base/project/structure/StandaloneProjectFactory.kt
+7 -2
View File
@@ -17,6 +17,7 @@ import com.intellij.psi.PsiJavaFile
import com.intellij.psi.impl.file.impl.JavaFileManager
import com.intellij.psi.search.GlobalSearchScope
import com.intellij.psi.search.ProjectScope
import com.intellij.util.io.URLUtil.JAR_PROTOCOL
import com.intellij.util.io.URLUtil.JAR_SEPARATOR
import org.jetbrains.kotlin.analysis.project.structure.*
import org.jetbrains.kotlin.cli.common.messages.MessageCollector
@@ -152,8 +153,12 @@ object StandaloneProjectFactory {
.filterIsInstance<KtBinaryModule>()
.flatMap { it.getBinaryRoots() }
.mapNotNull { path ->
val jar = environment.environment.jarFileSystem.findFileByPath(path.toAbsolutePath().toString() + JAR_SEPARATOR)
?: return@mapNotNull null
val pathString = path.toAbsolutePath().toString()
val jar =
if (pathString.endsWith(JAR_PROTOCOL))
environment.environment.jarFileSystem.findFileByPath(pathString + JAR_SEPARATOR)
else null
if (jar == null) return@mapNotNull null
JavaRoot(jar, JavaRoot.RootType.BINARY)
}