Skip to content

Commit 39599fc

Browse files
committed
Don't detect library kind for pure JVM projects
Also require .kjsm to detect JS libraries; don't detect jars containing only .js files as JS libraries #KT-19717 Fixed
1 parent 99a402e commit 39599fc

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

idea/idea-analysis/src/org/jetbrains/kotlin/idea/framework/LibraryKinds.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ private fun detectLibraryKindFromJarContents(jarRoot: VirtualFile): PersistentLi
8484
when (file.extension) {
8585
"class" -> false
8686

87-
"js", "kjsm" -> {
87+
"kjsm" -> {
8888
result = JSLibraryKind
8989
false
9090
}

idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleSourceSetDataService.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ class KotlinGradleLibraryDataService : AbstractProjectDataService<LibraryData, V
109109
if (toImport.isEmpty()) return
110110
val projectDataNode = toImport.first().parent!! as DataNode<ProjectData>
111111
val moduleDataNodes = projectDataNode.children.filter { it.data is ModuleData } as List<DataNode<ModuleData>>
112-
if (moduleDataNodes.any { detectPlatformByPlugin(it) != null}) {
112+
if (moduleDataNodes.any { detectPlatformByPlugin(it)?.takeIf { it !is TargetPlatformKind.Jvm } != null }) {
113113
for (libraryDataNode in toImport) {
114114
val ideLibrary = modelsProvider.findIdeLibrary(libraryDataNode.data) ?: continue
115115

0 commit comments

Comments
 (0)