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

Don't detect library kind for pure JVM projects

Browse Source 
Also require .kjsm to detect JS libraries; don't detect jars containing
only .js files as JS libraries

 #KT-19717 Fixed
This commit is contained in:
Dmitry Jemerov
2017-08-16 18:26:40 +02:00
parent 99a402ee30
commit 39599fc7c9
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/framework/LibraryKinds.kt
+1 -1
View File
@@ -84,7 +84,7 @@ private fun detectLibraryKindFromJarContents(jarRoot: VirtualFile): PersistentLi
when (file.extension) { when (file.extension) {
"class" -> false "class" -> false
"js", "kjsm" -> { "kjsm" -> {
result = JSLibraryKind result = JSLibraryKind
false false
} }
idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleSourceSetDataService.kt
+1 -1
View File
@@ -109,7 +109,7 @@ class KotlinGradleLibraryDataService : AbstractProjectDataService<LibraryData, V
if (toImport.isEmpty()) return if (toImport.isEmpty()) return
val projectDataNode = toImport.first().parent!! as DataNode<ProjectData> val projectDataNode = toImport.first().parent!! as DataNode<ProjectData>
val moduleDataNodes = projectDataNode.children.filter { it.data is ModuleData } as List<DataNode<ModuleData>> val moduleDataNodes = projectDataNode.children.filter { it.data is ModuleData } as List<DataNode<ModuleData>>
if (moduleDataNodes.any { detectPlatformByPlugin(it) != null}) { if (moduleDataNodes.any { detectPlatformByPlugin(it)?.takeIf { it !is TargetPlatformKind.Jvm } != null }) {
for (libraryDataNode in toImport) { for (libraryDataNode in toImport) {
val ideLibrary = modelsProvider.findIdeLibrary(libraryDataNode.data) ?: continue val ideLibrary = modelsProvider.findIdeLibrary(libraryDataNode.data) ?: continue