From 79ee51ca4c240c0450904725f6912d68b586f6e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yann=20C=C3=A9bron?= Date: Wed, 22 Mar 2017 10:00:06 +0100 Subject: [PATCH] ConfigProjectComponent: do not run in test mode --- .../plugincomponents/ConfigProjectComponent.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plugins/editorconfig/src/org/editorconfig/plugincomponents/ConfigProjectComponent.java b/plugins/editorconfig/src/org/editorconfig/plugincomponents/ConfigProjectComponent.java index 87aff37758fd..b43bc8ba4554 100644 --- a/plugins/editorconfig/src/org/editorconfig/plugincomponents/ConfigProjectComponent.java +++ b/plugins/editorconfig/src/org/editorconfig/plugincomponents/ConfigProjectComponent.java @@ -1,6 +1,7 @@ package org.editorconfig.plugincomponents; import com.intellij.AppTopics; +import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.editor.EditorFactory; import com.intellij.openapi.editor.ex.EditorEx; @@ -22,6 +23,8 @@ import org.jetbrains.annotations.NotNull; public class ConfigProjectComponent implements StartupActivity, DumbAware { @Override public void runActivity(@NotNull Project project) { + if (ApplicationManager.getApplication().isUnitTestMode()) return; + // Register project-level config managers final EditorFactory editorFactory = EditorFactory.getInstance(); MessageBus bus = project.getMessageBus(); @@ -53,7 +56,7 @@ public class ConfigProjectComponent implements StartupActivity, DumbAware { if (ProjectRootManager.getInstance(project).getFileIndex().isInContent(file) || !Registry.is("editor.config.stop.at.project.root")) { for (Editor editor : editorFactory.getAllEditors()) { - if (editor.isDisposed()) continue;; + if (editor.isDisposed()) continue; ((EditorEx)editor).reinitSettings(); } }