diff --git a/idea/ide-common/src/org/jetbrains/kotlin/idea/util/cidrUtil.kt b/idea/ide-common/src/org/jetbrains/kotlin/idea/util/cidrUtil.kt new file mode 100644 index 00000000000..dda06269d09 --- /dev/null +++ b/idea/ide-common/src/org/jetbrains/kotlin/idea/util/cidrUtil.kt @@ -0,0 +1,12 @@ +/* + * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * that can be found in the license/LICENSE.txt file. + */ + +@file:JvmName("CidrUtil") + +package org.jetbrains.kotlin.idea.util + +import com.intellij.util.PlatformUtils + +val isRunningInCidrIde by lazy { PlatformUtils.isCidr() } diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/facet/KotlinFacetType.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/facet/KotlinFacetType.kt index 42832f5297e..75bf85d1cb1 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/facet/KotlinFacetType.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/facet/KotlinFacetType.kt @@ -10,6 +10,7 @@ import com.intellij.facet.FacetTypeId import com.intellij.facet.FacetTypeRegistry import com.intellij.openapi.module.JavaModuleType import com.intellij.openapi.module.ModuleType +import org.jetbrains.kotlin.idea.util.isRunningInCidrIde import org.jetbrains.kotlin.idea.KotlinIcons import javax.swing.Icon @@ -24,7 +25,7 @@ abstract class KotlinFacetType : get() = FacetTypeRegistry.getInstance().findFacetType(TYPE_ID) } - override fun isSuitableModuleType(moduleType: ModuleType<*>) = moduleType is JavaModuleType + override fun isSuitableModuleType(moduleType: ModuleType<*>) = if (isRunningInCidrIde) true else moduleType is JavaModuleType override fun getIcon(): Icon = KotlinIcons.SMALL_LOGO -} \ No newline at end of file +} diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/facet/KotlinFacetType.kt.cidr183 b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/facet/KotlinFacetType.kt.cidr183 deleted file mode 100644 index b9e684a408d..00000000000 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/facet/KotlinFacetType.kt.cidr183 +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license - * that can be found in the license/LICENSE.txt file. - */ - -package org.jetbrains.kotlin.idea.facet - -import com.intellij.facet.FacetType -import com.intellij.facet.FacetTypeId -import com.intellij.facet.FacetTypeRegistry -import com.intellij.openapi.module.JavaModuleType -import com.intellij.openapi.module.ModuleType -import org.jetbrains.kotlin.idea.KotlinIcons -import javax.swing.Icon - -abstract class KotlinFacetType : - FacetType(TYPE_ID, ID, NAME) { - companion object { - const val ID = "kotlin-language" - val TYPE_ID = FacetTypeId(ID) - const val NAME = "Kotlin" - - val INSTANCE - get() = FacetTypeRegistry.getInstance().findFacetType(TYPE_ID) - } - - override fun isSuitableModuleType(moduleType: ModuleType<*>) = true - - override fun getIcon(): Icon = KotlinIcons.SMALL_LOGO -} \ No newline at end of file diff --git a/idea/src/org/jetbrains/kotlin/idea/actions/DecompileKotlinToJavaAction.kt b/idea/src/org/jetbrains/kotlin/idea/actions/DecompileKotlinToJavaAction.kt index 7cace2af94b..6d17f7d8c6e 100644 --- a/idea/src/org/jetbrains/kotlin/idea/actions/DecompileKotlinToJavaAction.kt +++ b/idea/src/org/jetbrains/kotlin/idea/actions/DecompileKotlinToJavaAction.kt @@ -24,8 +24,8 @@ import com.intellij.openapi.actionSystem.CommonDataKeys import com.intellij.openapi.roots.LibraryOrderEntry import com.intellij.openapi.util.ActionCallback import com.intellij.psi.PsiFile -import com.intellij.util.PlatformUtils import org.jetbrains.kotlin.idea.internal.showDecompiledCode +import org.jetbrains.kotlin.idea.util.isRunningInCidrIde import org.jetbrains.kotlin.psi.KtFile class DecompileKotlinToJavaAction : AnAction() { @@ -36,7 +36,7 @@ class DecompileKotlinToJavaAction : AnAction() { } override fun update(e: AnActionEvent) { - if (PlatformUtils.isCidr()) { + if (isRunningInCidrIde) { e.presentation.isEnabledAndVisible = false } else { e.presentation.isEnabled = getBinaryKotlinFile(e) != null diff --git a/idea/src/org/jetbrains/kotlin/idea/actions/JavaToKotlinAction.kt b/idea/src/org/jetbrains/kotlin/idea/actions/JavaToKotlinAction.kt index 1842581f5be..bc8afaf224c 100644 --- a/idea/src/org/jetbrains/kotlin/idea/actions/JavaToKotlinAction.kt +++ b/idea/src/org/jetbrains/kotlin/idea/actions/JavaToKotlinAction.kt @@ -31,8 +31,8 @@ import com.intellij.openapi.project.Project import com.intellij.openapi.ui.MessageType import com.intellij.openapi.ui.Messages import com.intellij.openapi.ui.ex.MessagesEx -import com.intellij.openapi.util.Key import com.intellij.openapi.ui.popup.JBPopupFactory +import com.intellij.openapi.util.Key import com.intellij.openapi.vfs.VfsUtilCore import com.intellij.openapi.vfs.VirtualFile import com.intellij.openapi.vfs.VirtualFileVisitor @@ -42,7 +42,6 @@ import com.intellij.psi.PsiErrorElement import com.intellij.psi.PsiJavaFile import com.intellij.psi.PsiManager import com.intellij.psi.util.PsiTreeUtil -import com.intellij.util.PlatformUtils import org.jetbrains.kotlin.idea.KotlinFileType import org.jetbrains.kotlin.idea.j2k.IdeaJavaToKotlinServices import org.jetbrains.kotlin.idea.j2k.J2kPostProcessor @@ -50,6 +49,7 @@ import org.jetbrains.kotlin.idea.refactoring.toPsiFile import org.jetbrains.kotlin.idea.util.application.executeWriteCommand import org.jetbrains.kotlin.idea.util.application.progressIndicatorNullable import org.jetbrains.kotlin.idea.util.application.runReadAction +import org.jetbrains.kotlin.idea.util.isRunningInCidrIde import org.jetbrains.kotlin.j2k.ConverterSettings import org.jetbrains.kotlin.j2k.JavaToKotlinConverter import org.jetbrains.kotlin.psi.KtFile @@ -203,7 +203,7 @@ class JavaToKotlinAction : AnAction() { } override fun update(e: AnActionEvent) { - if (PlatformUtils.isCidr()) { + if (isRunningInCidrIde) { e.presentation.isEnabledAndVisible = false } else { val virtualFiles = e.getData(CommonDataKeys.VIRTUAL_FILE_ARRAY) ?: return diff --git a/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.java b/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.java index a327dbe8853..d18961b0ffc 100644 --- a/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.java +++ b/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.java @@ -9,7 +9,6 @@ import com.intellij.icons.AllIcons; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.fileChooser.FileChooserDescriptor; -import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleManager; import com.intellij.openapi.options.Configurable; import com.intellij.openapi.options.ConfigurationException; @@ -20,7 +19,6 @@ import com.intellij.openapi.ui.TextFieldWithBrowseButton; import com.intellij.openapi.util.text.StringUtil; import com.intellij.ui.ListCellRendererWrapper; import com.intellij.ui.RawCommandLineEditor; -import com.intellij.util.PlatformUtils; import com.intellij.util.text.VersionComparatorUtil; import com.intellij.util.ui.ThreeStateCheckBox; import com.intellij.util.ui.UIUtil; @@ -41,6 +39,7 @@ import org.jetbrains.kotlin.idea.PluginStartupComponent; import org.jetbrains.kotlin.idea.facet.DescriptionListCellRenderer; import org.jetbrains.kotlin.idea.facet.KotlinFacet; import org.jetbrains.kotlin.idea.roots.RootUtilsKt; +import org.jetbrains.kotlin.idea.util.CidrUtil; import org.jetbrains.kotlin.idea.util.application.ApplicationUtilsKt; import org.jetbrains.kotlin.platform.IdePlatform; import org.jetbrains.kotlin.platform.IdePlatformKind; @@ -49,8 +48,6 @@ import org.jetbrains.kotlin.platform.impl.JvmIdePlatformUtil; import org.jetbrains.kotlin.platform.impl.JvmIdePlatformKind; import javax.swing.*; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; import java.util.*; public class KotlinCompilerConfigurableTab implements SearchableConfigurable, Configurable.NoScroll{ @@ -143,7 +140,7 @@ public class KotlinCompilerConfigurableTab implements SearchableConfigurable, Co fillLanguageAndAPIVersionList(); fillCoroutineSupportList(); - if (PlatformUtils.isCidr()) { + if (CidrUtil.isRunningInCidrIde()) { keepAliveCheckBox.setVisible(false); k2jvmPanel.setVisible(false); k2jsPanel.setVisible(false); diff --git a/idea/src/org/jetbrains/kotlin/idea/facet/KotlinFacetTypeImpl.kt b/idea/src/org/jetbrains/kotlin/idea/facet/KotlinFacetTypeImpl.kt index 0f8c2d95f68..639c8648104 100644 --- a/idea/src/org/jetbrains/kotlin/idea/facet/KotlinFacetTypeImpl.kt +++ b/idea/src/org/jetbrains/kotlin/idea/facet/KotlinFacetTypeImpl.kt @@ -18,19 +18,11 @@ package org.jetbrains.kotlin.idea.facet import com.intellij.facet.Facet import com.intellij.facet.ui.FacetEditor -import com.intellij.openapi.module.JavaModuleType import com.intellij.openapi.module.Module -import com.intellij.openapi.module.ModuleType import com.intellij.openapi.project.Project -import org.jetbrains.kotlin.idea.KotlinIcons -import javax.swing.Icon class KotlinFacetTypeImpl : KotlinFacetType() { - override fun isSuitableModuleType(moduleType: ModuleType<*>) = moduleType is JavaModuleType - - override fun getIcon(): Icon = KotlinIcons.SMALL_LOGO - override fun createDefaultConfiguration() = KotlinFacetConfigurationImpl() override fun createFacet( diff --git a/idea/src/org/jetbrains/kotlin/idea/facet/KotlinFacetTypeImpl.kt.cidr183 b/idea/src/org/jetbrains/kotlin/idea/facet/KotlinFacetTypeImpl.kt.cidr183 deleted file mode 100644 index 95a0c8b0d57..00000000000 --- a/idea/src/org/jetbrains/kotlin/idea/facet/KotlinFacetTypeImpl.kt.cidr183 +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright 2010-2016 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.kotlin.idea.facet - -import com.intellij.facet.Facet -import com.intellij.facet.ui.FacetEditor -import com.intellij.openapi.module.JavaModuleType -import com.intellij.openapi.module.Module -import com.intellij.openapi.module.ModuleType -import com.intellij.openapi.project.Project -import org.jetbrains.kotlin.idea.KotlinIcons -import javax.swing.Icon - -class KotlinFacetTypeImpl : KotlinFacetType() { - - override fun isSuitableModuleType(moduleType: ModuleType<*>) = true - - override fun getIcon(): Icon = KotlinIcons.SMALL_LOGO - - override fun createDefaultConfiguration() = KotlinFacetConfigurationImpl() - - override fun createFacet( - module: Module, - name: String, - configuration: KotlinFacetConfiguration, - underlyingFacet: Facet<*>? - ) = KotlinFacet(module, name, configuration) - - override fun createMultipleConfigurationsEditor(project: Project, editors: Array) = - MultipleKotlinFacetEditor(project, editors) -} \ No newline at end of file