From 997d896557c74a1ba83bdadfd258e213b1b3592f Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Fri, 14 Jun 2019 13:46:40 +0300 Subject: [PATCH] Inline ORDER_ENTRY_TYPE_ATTR to fix compilation in 192 branch --- .../idea/roots/KotlinNonJvmSourceRootConverterProvider.kt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/roots/KotlinNonJvmSourceRootConverterProvider.kt b/idea/src/org/jetbrains/kotlin/idea/roots/KotlinNonJvmSourceRootConverterProvider.kt index 42b8cd38b81..b1fa7e33a3e 100644 --- a/idea/src/org/jetbrains/kotlin/idea/roots/KotlinNonJvmSourceRootConverterProvider.kt +++ b/idea/src/org/jetbrains/kotlin/idea/roots/KotlinNonJvmSourceRootConverterProvider.kt @@ -11,7 +11,6 @@ import com.intellij.conversion.impl.ModuleSettingsImpl import com.intellij.openapi.roots.ExternalProjectSystemRegistry import com.intellij.openapi.roots.OrderRootType import com.intellij.openapi.roots.impl.ContentEntryImpl -import com.intellij.openapi.roots.impl.OrderEntryFactory.ORDER_ENTRY_TYPE_ATTR import com.intellij.openapi.roots.impl.SourceFolderImpl import com.intellij.openapi.roots.impl.libraries.ApplicationLibraryTable import com.intellij.openapi.roots.impl.libraries.LibraryEx @@ -115,7 +114,7 @@ class KotlinNonJvmSourceRootConverterProvider : ConverterProvider("kotlin-non-jv private fun findProjectLibrary(name: String) = projectLibrariesByName[name]?.firstOrNull() private fun createLibInfo(orderEntryElement: Element, moduleSettings: ModuleSettings): LibInfo? { - return when (orderEntryElement.getAttributeValue(ORDER_ENTRY_TYPE_ATTR)) { + return when (orderEntryElement.getAttributeValue("type")) { MODULE_LIBRARY_TYPE -> { orderEntryElement.getChild(LIBRARY_TAG)?.let { LibInfo.ByXml(it, context, moduleSettings) } }