From 86146ddf01f5de8c1ed5fe6d96475d69dada28d1 Mon Sep 17 00:00:00 2001
From: Natalia Ukhorskaya <natalia.ukhorskaya@jetbrains.com>
Date: Wed, 2 Sep 2015 19:41:30 +0300
Subject: [PATCH] Update to Idea 142.4465.2

---
 idea/src/META-INF/plugin.xml                               | 2 +-
 .../idea/highlighter/KotlinRunLineMarkerContributor.kt     | 2 +-
 .../kotlin/idea/inspections/UnusedImportInspection.kt      | 7 ++++---
 update_dependencies.xml                                    | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index 8af2db70ae7..9f90181d526 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -6,7 +6,7 @@
   <version>@snapshot@</version>
   <vendor url="http://www.jetbrains.com">JetBrains s.r.o.</vendor>
 
-  <idea-version since-build="142.4245.2" until-build="142.9999"/>
+  <idea-version since-build="142.4465.2" until-build="142.9999"/>
 
   <depends optional="true" config-file="junit.xml">JUnit</depends>
   <depends optional="true" config-file="gradle.xml">org.jetbrains.plugins.gradle</depends>
diff --git a/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinRunLineMarkerContributor.kt b/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinRunLineMarkerContributor.kt
index 9f7f4d3745a..402ccd93c86 100644
--- a/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinRunLineMarkerContributor.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinRunLineMarkerContributor.kt
@@ -38,7 +38,7 @@ public class KotlinRunLineMarkerContributor : RunLineMarkerContributor() {
         }
 
         if (detector.isMain(function)) {
-            return RunLineMarkerContributor.Info(JetIcons.LAUNCH, null, ExecutorAction.ACTIONS)
+            return RunLineMarkerContributor.Info(JetIcons.LAUNCH, null, ExecutorAction.getActions(0))
         }
 
         return null
diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/UnusedImportInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/UnusedImportInspection.kt
index e78ac07e6e7..3b377a8a52b 100644
--- a/idea/src/org/jetbrains/kotlin/idea/inspections/UnusedImportInspection.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/inspections/UnusedImportInspection.kt
@@ -21,6 +21,7 @@ import com.intellij.codeInsight.actions.OptimizeImportsProcessor
 import com.intellij.codeInsight.daemon.QuickFixBundle
 import com.intellij.codeInsight.daemon.impl.DaemonCodeAnalyzerEx
 import com.intellij.codeInsight.daemon.impl.DaemonListeners
+import com.intellij.codeInsight.daemon.impl.DaemonProgressIndicator
 import com.intellij.codeInsight.daemon.impl.HighlightingSessionImpl
 import com.intellij.codeInsight.intention.LowPriorityAction
 import com.intellij.codeInspection.InspectionManager
@@ -131,7 +132,7 @@ class UnusedImportInspection : AbstractKotlinInspection() {
         // unwrap progress indicator
         val progress = sequence(ProgressManager.getInstance().progressIndicator) {
             (it as? ProgressWrapper)?.originalProgressIndicator
-        }.last()
+        }.last() as DaemonProgressIndicator
         val highlightingSession = HighlightingSessionImpl.getHighlightingSession(file, progress)
 
         val project = highlightingSession.project
@@ -149,11 +150,11 @@ class UnusedImportInspection : AbstractKotlinInspection() {
                 }
             }
 
-            Disposer.register(highlightingSession, invokeFixLater)
+            Disposer.register(progress, invokeFixLater)
 
             if (progress.isCanceled) {
                 Disposer.dispose(invokeFixLater)
-                Disposer.dispose(highlightingSession)
+                Disposer.dispose(progress)
                 progress.checkCanceled()
             }
         }
diff --git a/update_dependencies.xml b/update_dependencies.xml
index 50669725011..29e91d4631c 100644
--- a/update_dependencies.xml
+++ b/update_dependencies.xml
@@ -1,5 +1,5 @@
 <project name="Update Dependencies" default="update" xmlns:if="ant:if" xmlns:unless="ant:unless">
-    <property name="ideaVersion" value="142.4245.2"/>
+    <property name="ideaVersion" value="142.4465.2"/>
 
     <property name="kotlin.bootstrap.locator" value="buildType:bt345,tag:bootstrap,status:SUCCESS"/>
     <property name="kotlin.bootstrap.locator.force" value="false"/>