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

use new API for excluding Kotlin plugin from update checks

Browse Source
This commit is contained in:
Dmitry Jemerov
2016-02-02 16:11:26 +01:00
parent 45a387668b
commit c881cd1070
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/PluginStartupComponent.java
+11 -2
View File
@@ -19,6 +19,7 @@ package org.jetbrains.kotlin.idea;
import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.PathMacros; import com.intellij.openapi.application.PathMacros;
import com.intellij.openapi.components.ApplicationComponent; import com.intellij.openapi.components.ApplicationComponent;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.editor.EditorFactory; import com.intellij.openapi.editor.EditorFactory;
import com.intellij.openapi.editor.event.DocumentAdapter; import com.intellij.openapi.editor.event.DocumentAdapter;
import com.intellij.openapi.editor.event.DocumentEvent; import com.intellij.openapi.editor.event.DocumentEvent;
@@ -26,7 +27,6 @@ import com.intellij.openapi.fileEditor.FileDocumentManager;
import com.intellij.openapi.updateSettings.impl.UpdateChecker; import com.intellij.openapi.updateSettings.impl.UpdateChecker;
import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.vfs.VirtualFile;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.idea.caches.IDEKotlinBinaryClassCache;
import org.jetbrains.kotlin.idea.caches.JarUserDataManager; import org.jetbrains.kotlin.idea.caches.JarUserDataManager;
import org.jetbrains.kotlin.idea.debugger.filter.DebuggerFiltersUtilKt; import org.jetbrains.kotlin.idea.debugger.filter.DebuggerFiltersUtilKt;
import org.jetbrains.kotlin.idea.framework.KotlinJavaScriptLibraryDetectionUtil; import org.jetbrains.kotlin.idea.framework.KotlinJavaScriptLibraryDetectionUtil;
@@ -36,6 +36,8 @@ import java.io.File;
import java.io.IOException; import java.io.IOException;
public class PluginStartupComponent implements ApplicationComponent { public class PluginStartupComponent implements ApplicationComponent {
private static final Logger LOG = Logger.getInstance(PluginStartupComponent.class);
private static final String KOTLIN_BUNDLED = "KOTLIN_BUNDLED"; private static final String KOTLIN_BUNDLED = "KOTLIN_BUNDLED";
public static PluginStartupComponent getInstance() { public static PluginStartupComponent getInstance() {
@@ -56,7 +58,14 @@ public class PluginStartupComponent implements ApplicationComponent {
DebuggerFiltersUtilKt.addKotlinStdlibDebugFilterIfNeeded(); DebuggerFiltersUtilKt.addKotlinStdlibDebugFilterIfNeeded();
UpdateChecker.getDisabledToUpdatePlugins().add("org.jetbrains.kotlin"); try {
// API added in 15.0.2
UpdateChecker.INSTANCE.getExcludedFromUpdateCheckPlugins().add("org.jetbrains.kotlin");
}
catch (Throwable throwable) {
LOG.debug("Excluding Kotlin plugin updates using old API", throwable);
UpdateChecker.getDisabledToUpdatePlugins().add("org.jetbrains.kotlin");
}
EditorFactory.getInstance().getEventMulticaster().addDocumentListener(new DocumentAdapter() { EditorFactory.getInstance().getEventMulticaster().addDocumentListener(new DocumentAdapter() {
@Override @Override
public void documentChanged(DocumentEvent e) { public void documentChanged(DocumentEvent e) {