JPS: support KotlinResourceSourceRootType
Implementation is similar to KotlinSourceRootProvider.
This workaround is required since ResourcesTarget.computeRootDescriptors
supports only JavaResourceRoots.
#KT-27622 Fixed
Original commit: dcc47fd8ef
This commit is contained in:
@@ -0,0 +1,49 @@
|
||||
/*
|
||||
* Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
|
||||
* that can be found in the license/LICENSE.txt file.
|
||||
*/
|
||||
|
||||
package org.jetbrains.kotlin.jps.build
|
||||
|
||||
import org.jetbrains.jps.builders.AdditionalRootsProviderService
|
||||
import org.jetbrains.jps.builders.BuildTarget
|
||||
import org.jetbrains.jps.builders.java.ResourceRootDescriptor
|
||||
import org.jetbrains.jps.builders.java.ResourcesTargetType
|
||||
import org.jetbrains.jps.builders.storage.BuildDataPaths
|
||||
import org.jetbrains.jps.incremental.ResourcesTarget
|
||||
import org.jetbrains.jps.model.java.JavaResourceRootProperties
|
||||
import org.jetbrains.kotlin.config.KotlinResourceRootType
|
||||
|
||||
class KotlinResourcesRootProvider : AdditionalRootsProviderService<ResourceRootDescriptor>(ResourcesTargetType.ALL_TYPES) {
|
||||
override fun getAdditionalRoots(
|
||||
target: BuildTarget<ResourceRootDescriptor>,
|
||||
dataPaths: BuildDataPaths?
|
||||
): List<ResourceRootDescriptor> {
|
||||
val moduleBuildTarget = target as? ResourcesTarget ?: return listOf()
|
||||
val module = moduleBuildTarget.module
|
||||
|
||||
val result = mutableListOf<ResourceRootDescriptor>()
|
||||
|
||||
// Add source roots with type KotlinResourceRootType.
|
||||
// See the note in KotlinSourceRootProvider
|
||||
val kotlinResourceRootType = if (target.isTests) KotlinResourceRootType.TestResource else KotlinResourceRootType.Resource
|
||||
module.getSourceRoots(kotlinResourceRootType).forEach {
|
||||
result.add(
|
||||
ResourceRootDescriptor(
|
||||
it.file,
|
||||
target,
|
||||
it.properties.packagePrefix,
|
||||
setOf()
|
||||
)
|
||||
)
|
||||
}
|
||||
|
||||
return result
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Copied from implementation of org.jetbrains.jps.incremental.ResourcesTarget.computeRootDescriptors
|
||||
*/
|
||||
private val JavaResourceRootProperties.packagePrefix: String
|
||||
get() = relativeOutputPath.replace('/', '.')
|
||||
Reference in New Issue
Block a user