From e1ae81e0a1087fef5c8dbc2616368429d8c2c6a1 Mon Sep 17 00:00:00 2001 From: Vladimir Dolzhenko Date: Mon, 16 Mar 2020 14:43:53 +0100 Subject: [PATCH] Run inspections after completion of general highlight pass in 201 #KT-37553 Fixed --- .../kotlin/idea/PluginStartupActivity.java | 2 ++ .../jetbrains/kotlin/idea/startupCompat.kt | 13 +++++++++++++ .../kotlin/idea/startupCompat.kt.201 | 19 +++++++++++++++++++ 3 files changed, 34 insertions(+) create mode 100644 idea/src/org/jetbrains/kotlin/idea/startupCompat.kt create mode 100644 idea/src/org/jetbrains/kotlin/idea/startupCompat.kt.201 diff --git a/idea/src/org/jetbrains/kotlin/idea/PluginStartupActivity.java b/idea/src/org/jetbrains/kotlin/idea/PluginStartupActivity.java index 2b9d50ddc33..954a15d9961 100644 --- a/idea/src/org/jetbrains/kotlin/idea/PluginStartupActivity.java +++ b/idea/src/org/jetbrains/kotlin/idea/PluginStartupActivity.java @@ -54,6 +54,8 @@ public class PluginStartupActivity implements StartupActivity.DumbAware { registerAdditionalResourceBundleInTests(); } + StartupCompatKt.runActivity(project); + registerPathVariable(); initializeDiagnostics(); diff --git a/idea/src/org/jetbrains/kotlin/idea/startupCompat.kt b/idea/src/org/jetbrains/kotlin/idea/startupCompat.kt new file mode 100644 index 00000000000..f780bb4dfc9 --- /dev/null +++ b/idea/src/org/jetbrains/kotlin/idea/startupCompat.kt @@ -0,0 +1,13 @@ +/* + * Copyright 2010-2020 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.openapi.project.Project + +// BUNCH: 193 +fun runActivity(project: Project) { + // nothing for 193 +} \ No newline at end of file diff --git a/idea/src/org/jetbrains/kotlin/idea/startupCompat.kt.201 b/idea/src/org/jetbrains/kotlin/idea/startupCompat.kt.201 new file mode 100644 index 00000000000..93fe3e931cc --- /dev/null +++ b/idea/src/org/jetbrains/kotlin/idea/startupCompat.kt.201 @@ -0,0 +1,19 @@ +/* + * Copyright 2010-2020 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.codeInsight.daemon.impl.DaemonCodeAnalyzerImpl +import com.intellij.openapi.project.Project +import org.jetbrains.kotlin.idea.util.runWhenSmart + +// BUNCH: 201 + +fun runActivity(project: Project) { + project.runWhenSmart { + val daemonCodeAnalyzer = DaemonCodeAnalyzerImpl.getInstanceEx(project) as DaemonCodeAnalyzerImpl + daemonCodeAnalyzer.runLocalInspectionPassAfterCompletionOfGeneralHighlightPass(true) + } +} \ No newline at end of file