From 5554a44f0f61bb1bf6a1b8ea22fe37b5d4740375 Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <Nikolay.Krasko@jetbrains.com>
Date: Mon, 31 Aug 2015 19:23:36 +0300
Subject: [PATCH] Update to 142.4245.2: Update Kotlin run line marker info to
 new API

---
 idea/src/META-INF/plugin.xml                  |  4 +++-
 ...r.kt => KotlinRunLineMarkerContributor.kt} | 19 +++++++------------
 2 files changed, 10 insertions(+), 13 deletions(-)
 rename idea/src/org/jetbrains/kotlin/idea/highlighter/{KotlinRunLineMarkerProvider.kt => KotlinRunLineMarkerContributor.kt} (65%)

diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index 2de48a435ab..249e3d00cdb 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -403,9 +403,11 @@
     <configurationType implementation="org.jetbrains.kotlin.idea.k2jsrun.K2JSRunConfigurationType"/>
     <programRunner implementation="org.jetbrains.kotlin.idea.k2jsrun.K2JSBrowserProgramRunner"/>
     <runConfigurationProducer implementation="org.jetbrains.kotlin.idea.run.KotlinRunConfigurationProducer"/>
+
     <codeInsight.lineMarkerProvider language="jet" implementationClass="org.jetbrains.kotlin.idea.highlighter.markers.KotlinLineMarkerProvider"/>
     <codeInsight.lineMarkerProvider language="jet" implementationClass="org.jetbrains.kotlin.idea.highlighter.KotlinRecursiveCallLineMarkerProvider"/>
-    <codeInsight.lineMarkerProvider language="jet" implementationClass="org.jetbrains.kotlin.idea.highlighter.KotlinRunLineMarkerProvider"/>
+    <runLineMarkerContributor language="jet" implementationClass="org.jetbrains.kotlin.idea.highlighter.KotlinRunLineMarkerContributor"/>
+
     <iconProvider implementation="org.jetbrains.kotlin.idea.JetIconProvider"/>
     <itemPresentationProvider implementationClass="org.jetbrains.kotlin.idea.presentation.JetFunctionPresenter"
                               forClass="org.jetbrains.kotlin.psi.JetFunction"/>
diff --git a/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinRunLineMarkerProvider.kt b/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinRunLineMarkerContributor.kt
similarity index 65%
rename from idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinRunLineMarkerProvider.kt
rename to idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinRunLineMarkerContributor.kt
index f4f9f70f2ea..9f7f4d3745a 100644
--- a/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinRunLineMarkerProvider.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinRunLineMarkerContributor.kt
@@ -16,9 +16,8 @@
 
 package org.jetbrains.kotlin.idea.highlighter
 
-import com.intellij.codeInsight.daemon.LineMarkerInfo
-import com.intellij.codeInsight.daemon.LineMarkerProvider
-import com.intellij.execution.lineMarker.RunLineMarkerInfo
+import com.intellij.execution.lineMarker.ExecutorAction
+import com.intellij.execution.lineMarker.RunLineMarkerContributor
 import com.intellij.psi.PsiElement
 import org.jetbrains.kotlin.descriptors.FunctionDescriptor
 import org.jetbrains.kotlin.idea.JetIcons
@@ -27,25 +26,21 @@ import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptor
 import org.jetbrains.kotlin.psi.JetNamedFunction
 
 
-public class KotlinRunLineMarkerProvider : LineMarkerProvider {
-    override fun getLineMarkerInfo(e: PsiElement): LineMarkerInfo<PsiElement>? {
-        val function = e.parent as? JetNamedFunction
+public class KotlinRunLineMarkerContributor : RunLineMarkerContributor() {
+    override fun getInfo(element: PsiElement?): RunLineMarkerContributor.Info? {
+        val function = element?.parent as? JetNamedFunction
         if (function == null) return null
 
-        if (function.nameIdentifier != e) return null
+        if (function.nameIdentifier != element) return null
 
         val detector = MainFunctionDetector { function ->
             function.resolveToDescriptor() as FunctionDescriptor
         }
 
         if (detector.isMain(function)) {
-            return RunLineMarkerInfo(function, JetIcons.LAUNCH, null)
+            return RunLineMarkerContributor.Info(JetIcons.LAUNCH, null, ExecutorAction.ACTIONS)
         }
 
         return null
-
-    }
-
-    override fun collectSlowLineMarkers(elements: List<PsiElement>, result: MutableCollection<LineMarkerInfo<PsiElement>>) {
     }
 }
\ No newline at end of file