From 314173af60b69d19eed54ec7b8008989f56d727a Mon Sep 17 00:00:00 2001 From: Dmitriy Dolovov Date: Mon, 10 Sep 2018 17:16:45 +0300 Subject: [PATCH] Disable specific EPs for K/N plugin for CLion/AppCode #KT-26717 --- .../konan/gradle/KotlinNativeIdeInitializer.java | 3 ++- .../ide/konan/KotlinNativeApplicationComponent.kt | 15 +++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/idea/idea-gradle-native/src/org/jetbrains/kotlin/ide/konan/gradle/KotlinNativeIdeInitializer.java b/idea/idea-gradle-native/src/org/jetbrains/kotlin/ide/konan/gradle/KotlinNativeIdeInitializer.java index fb015b62245..e878eb989c8 100644 --- a/idea/idea-gradle-native/src/org/jetbrains/kotlin/ide/konan/gradle/KotlinNativeIdeInitializer.java +++ b/idea/idea-gradle-native/src/org/jetbrains/kotlin/ide/konan/gradle/KotlinNativeIdeInitializer.java @@ -14,7 +14,8 @@ public class KotlinNativeIdeInitializer implements ApplicationComponent { @Override public void initComponent() { - unregisterGroovyInspections(); + // TODO: Move this to Kotlin/Native plugin for CLion and AppCode (see KT-26717): + //unregisterGroovyInspections(); } // There are groovy local inspections which should not be loaded w/o groovy plugin enabled. diff --git a/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/KotlinNativeApplicationComponent.kt b/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/KotlinNativeApplicationComponent.kt index 60ad1639e6c..18f5bd860fa 100644 --- a/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/KotlinNativeApplicationComponent.kt +++ b/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/KotlinNativeApplicationComponent.kt @@ -6,9 +6,7 @@ package org.jetbrains.kotlin.ide.konan import com.intellij.ide.highlighter.ArchiveFileType -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 @@ -19,11 +17,12 @@ class KotlinNativeApplicationComponent : ApplicationComponent { override fun initComponent() { 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")) { - TipAndTrickBean.findByFileName(name)?.let { - extensionPoint.unregisterExtension(it) - } - } + // TODO: Move this to Kotlin/Native plugin for CLion and AppCode (see KT-26717): +// val extensionPoint = Extensions.getRootArea().getExtensionPoint(TipAndTrickBean.EP_NAME) +// for (name in arrayOf("Kotlin.html", "Kotlin_project.html", "Kotlin_mix.html", "Kotlin_Java_convert.html")) { +// TipAndTrickBean.findByFileName(name)?.let { +// extensionPoint.unregisterExtension(it) +// } +// } } }