From 0f6157d376f0198b083fcd4fc92951e5a361d99b Mon Sep 17 00:00:00 2001 From: Sergei Vorobyov Date: Tue, 3 Dec 2019 20:56:02 +0300 Subject: [PATCH] [auto-import] added registry key to disable auto-import GitOrigin-RevId: 42a92f36d3e640fdb9d1b4bb46b6cc965e3bc79d --- .../externalSystem/autoimport/AutoImportProjectTracker.kt | 4 +++- platform/util/resources/misc/registry.properties | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/autoimport/AutoImportProjectTracker.kt b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/autoimport/AutoImportProjectTracker.kt index 62cb0f8a74b0..36fa61885f55 100644 --- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/autoimport/AutoImportProjectTracker.kt +++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/autoimport/AutoImportProjectTracker.kt @@ -19,6 +19,7 @@ import com.intellij.openapi.observable.operations.CompoundParallelOperationTrace import com.intellij.openapi.observable.properties.AtomicBooleanProperty import com.intellij.openapi.project.Project import com.intellij.openapi.util.Disposer +import com.intellij.openapi.util.registry.Registry import com.intellij.util.LocalTimeCounter.currentTime import com.intellij.util.ui.update.MergingUpdateQueue import com.intellij.util.ui.update.Update @@ -99,7 +100,7 @@ class AutoImportProjectTracker(private val project: Project) : ExternalSystemPro private fun refreshProject() { LOG.debug("Incremental project refresh") - if (isDisabled.get()) return + if (isDisabled.get() || Registry.`is`("external.system.auto.import.disabled")) return if (!projectChangeOperation.isOperationCompleted()) return for (projectData in projectDataMap.values) { val projectId = projectData.projectAware.projectId.readableName @@ -115,6 +116,7 @@ class AutoImportProjectTracker(private val project: Project) : ExternalSystemPro private fun updateProjectNotification() { LOG.debug("Notification status update") + if (isDisabled.get() || Registry.`is`("external.system.auto.import.disabled")) return val notificationAware = ProjectNotificationAware.getInstance(project) for ((projectId, data) in projectDataMap) { when (data.isUpToDate()) { diff --git a/platform/util/resources/misc/registry.properties b/platform/util/resources/misc/registry.properties index d39b0c6a909b..612e09578a4e 100644 --- a/platform/util/resources/misc/registry.properties +++ b/platform/util/resources/misc/registry.properties @@ -1354,6 +1354,8 @@ external.system.substitute.library.dependencies=false external.system.substitute.library.dependencies.description=Replace library dependencies with module dependencies imported from external build systems like Maven/Gradle external.system.configuration.import.enabled=true external.system.configuration.import.enabled.description=Enable import of IntelliJ specific settings from external build system +external.system.auto.import.disabled=false +external.system.auto.import.disabled.description=Disable auto-import build system model to idea tfs.set.connection.timeout=false