azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't trigger update check when an in-memory file is modified

Browse Source 
#KT-18954 Fixed
This commit is contained in:
Dmitry Jemerov
2017-07-12 15:48:55 +02:00
parent 2d3ce89afc
commit 9b37e76b14
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/KotlinPluginUpdater.kt
+4 -2
View File
@@ -38,6 +38,7 @@ import com.intellij.openapi.updateSettings.impl.UpdateSettings
import com.intellij.openapi.util.JDOMUtil import com.intellij.openapi.util.JDOMUtil
import com.intellij.openapi.util.SystemInfo import com.intellij.openapi.util.SystemInfo
import com.intellij.openapi.vfs.CharsetToolkit import com.intellij.openapi.vfs.CharsetToolkit
import com.intellij.openapi.vfs.VirtualFile
import com.intellij.util.Alarm import com.intellij.util.Alarm
import com.intellij.util.io.HttpRequests import com.intellij.util.io.HttpRequests
import com.intellij.util.text.VersionComparatorUtil import com.intellij.util.text.VersionComparatorUtil
@@ -87,8 +88,9 @@ class KotlinPluginUpdater(val propertiesComponent: PropertiesComponent) : Dispos
@Volatile private var checkQueued = false @Volatile private var checkQueued = false
@Volatile private var lastUpdateStatus: PluginUpdateStatus? = null @Volatile private var lastUpdateStatus: PluginUpdateStatus? = null
fun kotlinFileEdited() { fun kotlinFileEdited(file: VirtualFile) {
if (ApplicationManager.getApplication().isUnitTestMode) return if (!file.isInLocalFileSystem) return
if (ApplicationManager.getApplication().isUnitTestMode || ApplicationManager.getApplication().isHeadlessEnvironment) return
if (!UpdateSettings.getInstance().isCheckNeeded) return if (!UpdateSettings.getInstance().isCheckNeeded) return
val lastUpdateTime = java.lang.Long.parseLong(propertiesComponent.getValue(PROPERTY_NAME, "0")) val lastUpdateTime = java.lang.Long.parseLong(propertiesComponent.getValue(PROPERTY_NAME, "0"))
idea/src/org/jetbrains/kotlin/idea/PluginStartupComponent.java
+1 -1
View File
@@ -80,7 +80,7 @@ public class PluginStartupComponent implements ApplicationComponent {
public void documentChanged(DocumentEvent e) { public void documentChanged(DocumentEvent e) {
VirtualFile virtualFile = FileDocumentManager.getInstance().getFile(e.getDocument()); VirtualFile virtualFile = FileDocumentManager.getInstance().getFile(e.getDocument());
if (virtualFile != null && virtualFile.getFileType() == KotlinFileType.INSTANCE) { if (virtualFile != null && virtualFile.getFileType() == KotlinFileType.INSTANCE) {
KotlinPluginUpdater.Companion.getInstance().kotlinFileEdited(); KotlinPluginUpdater.Companion.getInstance().kotlinFileEdited(virtualFile);
} }
} }
}); });