From 9b37e76b14fd035d2e10a287e7a6d0dccf06b6f1 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Wed, 12 Jul 2017 15:48:55 +0200 Subject: [PATCH] Don't trigger update check when an in-memory file is modified #KT-18954 Fixed --- idea/src/org/jetbrains/kotlin/idea/KotlinPluginUpdater.kt | 6 ++++-- .../org/jetbrains/kotlin/idea/PluginStartupComponent.java | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/KotlinPluginUpdater.kt b/idea/src/org/jetbrains/kotlin/idea/KotlinPluginUpdater.kt index 65fb87062b6..9c1bd42d23b 100644 --- a/idea/src/org/jetbrains/kotlin/idea/KotlinPluginUpdater.kt +++ b/idea/src/org/jetbrains/kotlin/idea/KotlinPluginUpdater.kt @@ -38,6 +38,7 @@ import com.intellij.openapi.updateSettings.impl.UpdateSettings import com.intellij.openapi.util.JDOMUtil import com.intellij.openapi.util.SystemInfo import com.intellij.openapi.vfs.CharsetToolkit +import com.intellij.openapi.vfs.VirtualFile import com.intellij.util.Alarm import com.intellij.util.io.HttpRequests import com.intellij.util.text.VersionComparatorUtil @@ -87,8 +88,9 @@ class KotlinPluginUpdater(val propertiesComponent: PropertiesComponent) : Dispos @Volatile private var checkQueued = false @Volatile private var lastUpdateStatus: PluginUpdateStatus? = null - fun kotlinFileEdited() { - if (ApplicationManager.getApplication().isUnitTestMode) return + fun kotlinFileEdited(file: VirtualFile) { + if (!file.isInLocalFileSystem) return + if (ApplicationManager.getApplication().isUnitTestMode || ApplicationManager.getApplication().isHeadlessEnvironment) return if (!UpdateSettings.getInstance().isCheckNeeded) return val lastUpdateTime = java.lang.Long.parseLong(propertiesComponent.getValue(PROPERTY_NAME, "0")) diff --git a/idea/src/org/jetbrains/kotlin/idea/PluginStartupComponent.java b/idea/src/org/jetbrains/kotlin/idea/PluginStartupComponent.java index 63b2a936be4..e8a3fadaeb8 100644 --- a/idea/src/org/jetbrains/kotlin/idea/PluginStartupComponent.java +++ b/idea/src/org/jetbrains/kotlin/idea/PluginStartupComponent.java @@ -80,7 +80,7 @@ public class PluginStartupComponent implements ApplicationComponent { public void documentChanged(DocumentEvent e) { VirtualFile virtualFile = FileDocumentManager.getInstance().getFile(e.getDocument()); if (virtualFile != null && virtualFile.getFileType() == KotlinFileType.INSTANCE) { - KotlinPluginUpdater.Companion.getInstance().kotlinFileEdited(); + KotlinPluginUpdater.Companion.getInstance().kotlinFileEdited(virtualFile); } } });