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

Pill: Fix platform source attachment in compiler modules

Browse Source
This commit is contained in:
Yan Zhulanow
2019-07-26 21:16:35 +09:00
parent 086b151e1f
commit b3941c4ed0
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
buildSrc/src/main/kotlin/pill/plugin.kt
+3 -1
View File
@@ -98,6 +98,7 @@ class JpsCompatiblePlugin : Plugin<Project> {
private lateinit var platformVersion: String private lateinit var platformVersion: String
private lateinit var platformBaseNumber: String private lateinit var platformBaseNumber: String
private lateinit var platformDir: File private lateinit var platformDir: File
private lateinit var intellijCoreDir: File
private var isAndroidStudioPlatform: Boolean = false private var isAndroidStudioPlatform: Boolean = false
private fun initEnvironment(project: Project) { private fun initEnvironment(project: Project) {
@@ -107,6 +108,7 @@ class JpsCompatiblePlugin : Plugin<Project> {
?: platformVersion.substringBefore("-", "").takeIf { it.isNotEmpty() } ?: platformVersion.substringBefore("-", "").takeIf { it.isNotEmpty() }
?: error("Invalid platform version: $platformVersion") ?: error("Invalid platform version: $platformVersion")
platformDir = IntellijRootUtils.getIntellijRootDir(project) platformDir = IntellijRootUtils.getIntellijRootDir(project)
intellijCoreDir = File(platformDir.parentFile.parentFile.parentFile, "intellij-core")
isAndroidStudioPlatform = project.extensions.extraProperties.has("versions.androidStudioRelease") isAndroidStudioPlatform = project.extensions.extraProperties.has("versions.androidStudioRelease")
} }
@@ -300,7 +302,7 @@ class JpsCompatiblePlugin : Plugin<Project> {
private fun attachPlatformSources(library: PLibrary): PLibrary { private fun attachPlatformSources(library: PLibrary): PLibrary {
val platformSourcesJar = File(platformDir, "../../../sources/intellij-$platformVersion-sources.jar") val platformSourcesJar = File(platformDir, "../../../sources/intellij-$platformVersion-sources.jar")
if (library.classes.any { it.startsWith(platformDir) }) { if (library.classes.any { it.startsWith(platformDir) || it.startsWith(intellijCoreDir) }) {
return library.attachSource(platformSourcesJar) return library.attachSource(platformSourcesJar)
} }