From adbb07f30bded119f058f6ff755b0b370d2709cc Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Thu, 21 Jul 2016 20:30:17 +0300 Subject: [PATCH] Do not fail on adding sources to libraries that can't be recognized (EA-73238) It's valid situation when user in Gradle project had created ordinal Java module and wants to configure it with Kotlin. We should add Gradle library to dependency but there's no need to configure sources for it. --- .../idea/configuration/KotlinWithLibraryConfigurator.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinWithLibraryConfigurator.java b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinWithLibraryConfigurator.java index 5905c88ff68..976bbdadaf8 100644 --- a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinWithLibraryConfigurator.java +++ b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinWithLibraryConfigurator.java @@ -139,7 +139,9 @@ public abstract class KotlinWithLibraryConfigurator implements KotlinProjectConf configureModuleWithLibraryClasses(module, libraryState, runtimeState, dirToCopyJar, collector); Library library = getKotlinLibrary(project); - assert library != null : "Kotlin library should exists when adding sources root"; + + if (library == null) return; + String dirToCopySourcesJar = getPathToCopyFileTo(project, OrderRootType.SOURCES, defaultPath, pathFromDialog); FileState sourcesState = getJarState(project, files.getRuntimeSourcesDestination(dirToCopySourcesJar), OrderRootType.SOURCES, pathFromDialog == null);