From f6c61fbe300cd3ff7e6e586a363746cef37f0fcc Mon Sep 17 00:00:00 2001 From: Dmitriy Dolovov Date: Mon, 3 Sep 2018 17:37:53 +0300 Subject: [PATCH] Remove useless TODOs --- .../src/org/jetbrains/konan/KonanApplicationComponent.kt | 3 ++- .../src/org/jetbrains/konan/analyser/KonanAnalyzerFacade.kt | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/idea/idea-native/src/org/jetbrains/konan/KonanApplicationComponent.kt b/idea/idea-native/src/org/jetbrains/konan/KonanApplicationComponent.kt index e78c6701e93..dda0750e52d 100644 --- a/idea/idea-native/src/org/jetbrains/konan/KonanApplicationComponent.kt +++ b/idea/idea-native/src/org/jetbrains/konan/KonanApplicationComponent.kt @@ -10,12 +10,13 @@ import com.intellij.ide.util.TipAndTrickBean import com.intellij.openapi.components.ApplicationComponent import com.intellij.openapi.extensions.Extensions import com.intellij.openapi.fileTypes.FileTypeManager +import org.jetbrains.kotlin.konan.library.KLIB_FILE_EXTENSION class KonanApplicationComponent : ApplicationComponent { override fun getComponentName(): String = "KonanApplicationComponent" override fun initComponent() { - FileTypeManager.getInstance().associateExtension(ArchiveFileType.INSTANCE, "klib") + FileTypeManager.getInstance().associateExtension(ArchiveFileType.INSTANCE, KLIB_FILE_EXTENSION) val extensionPoint = Extensions.getRootArea().getExtensionPoint(TipAndTrickBean.EP_NAME) for (name in arrayOf("Kotlin.html", "Kotlin_project.html", "Kotlin_mix.html", "Kotlin_Java_convert.html")) { diff --git a/idea/idea-native/src/org/jetbrains/konan/analyser/KonanAnalyzerFacade.kt b/idea/idea-native/src/org/jetbrains/konan/analyser/KonanAnalyzerFacade.kt index 1268302cf81..61e3a9dd956 100644 --- a/idea/idea-native/src/org/jetbrains/konan/analyser/KonanAnalyzerFacade.kt +++ b/idea/idea-native/src/org/jetbrains/konan/analyser/KonanAnalyzerFacade.kt @@ -67,7 +67,7 @@ object KonanAnalyzerFacade : ResolverForModuleFactory() { val moduleDescriptors = module.createResolvedModuleDescriptors( moduleContext.storageManager, - moduleContext.module.builtIns, // FIXME(ddol): investigate: reuse existing builtIns (from KonanPlatformSupport) or create new one + moduleContext.module.builtIns, languageVersionSettings )