From fdf7b0c9fbb6c3948d59527e31b5050a49e00509 Mon Sep 17 00:00:00 2001
From: Dmitriy Dolovov <Dmitriy.Dolovov@jetbrains.com>
Date: Fri, 24 May 2019 16:16:19 +0300
Subject: [PATCH] Convert KotlinPluginUtil to Kotlin

---
 .../kotlin/idea/KotlinPluginUtil.java         | 63 -------------------
 .../jetbrains/kotlin/idea/KotlinPluginUtil.kt | 53 ++++++++++++++++
 2 files changed, 53 insertions(+), 63 deletions(-)
 delete mode 100644 idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinPluginUtil.java
 create mode 100644 idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinPluginUtil.kt

diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinPluginUtil.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinPluginUtil.java
deleted file mode 100644
index 3a637438d7c..00000000000
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinPluginUtil.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright 2000-2018 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * 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;
-
-import com.intellij.ide.plugins.IdeaPluginDescriptor;
-import com.intellij.ide.plugins.PluginManager;
-import com.intellij.ide.plugins.PluginManagerCore;
-import com.intellij.openapi.extensions.PluginId;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.Arrays;
-
-public class KotlinPluginUtil {
-    public static final PluginId KOTLIN_PLUGIN_ID;
-
-    private static final String PATCHED_PLUGIN_VERSION;
-    private static final String PATCHED_PLUGIN_VERSION_KEY = "kotlin.plugin.version";
-
-    static {
-        PluginId pluginId = PluginManagerCore.getPluginByClassName(KotlinPluginUtil.class.getName());
-        if (pluginId == null) {
-            pluginId = PluginId.getId("org.jetbrains.kotlin");
-        }
-        KOTLIN_PLUGIN_ID = pluginId;
-
-        PATCHED_PLUGIN_VERSION = System.getProperty(PATCHED_PLUGIN_VERSION_KEY, null);
-    }
-
-    @NotNull
-    public static String getPluginVersion() {
-        if (PATCHED_PLUGIN_VERSION != null) {
-            assert isPatched();
-            return PATCHED_PLUGIN_VERSION;
-        }
-
-        //noinspection deprecation
-        return getPluginVersionFromIdea();
-    }
-
-    @SuppressWarnings("DeprecatedIsStillUsed")
-    @Deprecated
-    @NotNull
-    public static String getPluginVersionFromIdea() {
-        IdeaPluginDescriptor plugin = PluginManager.getPlugin(KOTLIN_PLUGIN_ID);
-        assert plugin != null : "Kotlin plugin not found: " + Arrays.toString(PluginManagerCore.getPlugins());
-        return plugin.getVersion();
-    }
-
-    public static boolean isPatched() {
-        return PATCHED_PLUGIN_VERSION != null;
-    }
-
-    public static boolean isSnapshotVersion() {
-        return "@snapshot@".equals(getPluginVersion());
-    }
-
-    public static boolean isDevVersion() {
-        return getPluginVersion().contains("-dev-");
-    }
-}
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinPluginUtil.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinPluginUtil.kt
new file mode 100644
index 00000000000..3126c712410
--- /dev/null
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinPluginUtil.kt
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * 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
+
+import com.intellij.ide.plugins.PluginManager
+import com.intellij.ide.plugins.PluginManagerCore
+import com.intellij.openapi.extensions.PluginId
+import java.util.*
+
+object KotlinPluginUtil {
+
+    val KOTLIN_PLUGIN_ID: PluginId = PluginManagerCore.getPluginByClassName(KotlinPluginUtil::class.java.name)
+        ?: PluginId.getId("org.jetbrains.kotlin")
+
+    private const val PATCHED_PLUGIN_VERSION_KEY = "kotlin.plugin.version"
+    private val PATCHED_PLUGIN_VERSION: String? = System.getProperty(PATCHED_PLUGIN_VERSION_KEY, null)
+
+    @JvmStatic
+    fun getPluginVersion(): String {
+        if (PATCHED_PLUGIN_VERSION != null) {
+            assert(isPatched())
+            return PATCHED_PLUGIN_VERSION
+        }
+
+        @Suppress("DEPRECATION")
+        return getPluginVersionFromIdea()
+    }
+
+    @Deprecated("This method returns original plugin version. Please use getPluginVersion() instead.")
+    @JvmStatic
+    fun getPluginVersionFromIdea(): String {
+        val plugin = PluginManager.getPlugin(KOTLIN_PLUGIN_ID)
+            ?: error("Kotlin plugin not found: " + Arrays.toString(PluginManagerCore.getPlugins()))
+        return plugin.version
+    }
+
+    @JvmStatic
+    fun isPatched(): Boolean {
+        return PATCHED_PLUGIN_VERSION != null
+    }
+
+    @JvmStatic
+    fun isSnapshotVersion(): Boolean {
+        return "@snapshot@" == getPluginVersion()
+    }
+
+    fun isDevVersion(): Boolean {
+        return getPluginVersion().contains("-dev-")
+    }
+}