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

Fix stdlib-jre7/8 configuration in new projects

Browse Source 
#KT-17875 Fixed
 #KT-17876 Fixed
This commit is contained in:
Dmitry Jemerov
2017-05-15 17:48:31 +02:00
parent 57cb556efd
commit f113a5ce99
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/configuration/KotlinWithLibraryConfigurator.kt
+4
View File
@@ -303,6 +303,10 @@ abstract class KotlinWithLibraryConfigurator internal constructor() : KotlinProj
if (library == null) return null if (library == null) return null
val libraryFiles = library.getUrls(type) val libraryFiles = library.getUrls(type)
return getPathFromLibraryUrls(libraryFiles)
}
fun getPathFromLibraryUrls(libraryFiles: Array<String>): String? {
if (libraryFiles.size < 1) return null if (libraryFiles.size < 1) return null
val pathToJarInLib = VfsUtilCore.urlToPath(libraryFiles[0]) val pathToJarInLib = VfsUtilCore.urlToPath(libraryFiles[0])
idea/src/org/jetbrains/kotlin/idea/framework/CustomLibraryDescriptorWithDeferredConfig.kt
+5 -4
View File
@@ -16,7 +16,6 @@
package org.jetbrains.kotlin.idea.framework package org.jetbrains.kotlin.idea.framework
import com.google.common.collect.Lists
import com.intellij.framework.library.LibraryVersionProperties import com.intellij.framework.library.LibraryVersionProperties
import com.intellij.openapi.module.Module import com.intellij.openapi.module.Module
import com.intellij.openapi.project.Project import com.intellij.openapi.project.Project
@@ -77,13 +76,13 @@ abstract class CustomLibraryDescriptorWithDeferredConfig
} ?: return } ?: return
val model = library.modifiableModel val model = library.modifiableModel
val copyToPath = KotlinWithLibraryConfigurator.getPathFromLibrary(library, OrderRootType.CLASSES)
try { try {
val collector = createConfigureKotlinNotificationCollector(module.project) val collector = createConfigureKotlinNotificationCollector(module.project)
copyFileRequests?.performRequests(module.getModuleDir(), model, collector) copyFileRequests?.performRequests(module.getModuleDir(), model, collector)
val copyToPath = KotlinWithLibraryConfigurator.getPathFromLibraryUrls(model.getUrls(OrderRootType.CLASSES))
if (copyToPath != null) { if (copyToPath != null) {
val jarState = if (copyFileRequests == null) DO_NOT_COPY else COPY val jarState = if (copyFileRequests?.isEmpty() != false) DO_NOT_COPY else COPY
// Now that we know the SDK which is going to be set for the module, we can add jre 7/8 if required // Now that we know the SDK which is going to be set for the module, we can add jre 7/8 if required
val descriptorsWithSdk = configurator.getLibraryJarDescriptors(rootModel.sdk) val descriptorsWithSdk = configurator.getLibraryJarDescriptors(rootModel.sdk)
@@ -108,7 +107,9 @@ abstract class CustomLibraryDescriptorWithDeferredConfig
} }
class DeferredCopyFileRequests(private val configurator: KotlinWithLibraryConfigurator) { class DeferredCopyFileRequests(private val configurator: KotlinWithLibraryConfigurator) {
private val copyFilesRequests = Lists.newArrayList<CopyFileRequest>() private val copyFilesRequests = arrayListOf<CopyFileRequest>()
fun isEmpty() = copyFilesRequests.isEmpty()
fun performRequests(relativePath: String, model: Library.ModifiableModel, collector: NotificationMessageCollector) { fun performRequests(relativePath: String, model: Library.ModifiableModel, collector: NotificationMessageCollector) {
for (request in copyFilesRequests) { for (request in copyFilesRequests) {