Update to Idea 142.4465.2

This commit is contained in:
Natalia Ukhorskaya
2015-09-02 19:41:30 +03:00
parent 3a4dfc5241
commit 86146ddf01
4 changed files with 7 additions and 6 deletions
+1 -1
View File
@@ -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>
@@ -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
@@ -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()
}
}
+1 -1
View File
@@ -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"/>