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 @@
@snapshot@
JetBrains s.r.o.
-
+
JUnit
org.jetbrains.plugins.gradle
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 @@
-
+