From b44aad9e8d6c60e4fa3a6d395e88fdb1a27318ff Mon Sep 17 00:00:00 2001 From: Dennis Ushakov Date: Wed, 1 Jun 2016 17:10:45 +0300 Subject: [PATCH] check whether .editorconfig file belongs to the project --- .../plugincomponents/ConfigProjectComponent.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/plugins/editorconfig/src/org/editorconfig/plugincomponents/ConfigProjectComponent.java b/plugins/editorconfig/src/org/editorconfig/plugincomponents/ConfigProjectComponent.java index ef911b174fe4..436bc59cdd05 100644 --- a/plugins/editorconfig/src/org/editorconfig/plugincomponents/ConfigProjectComponent.java +++ b/plugins/editorconfig/src/org/editorconfig/plugincomponents/ConfigProjectComponent.java @@ -6,6 +6,9 @@ import com.intellij.openapi.editor.Editor; import com.intellij.openapi.editor.EditorFactory; import com.intellij.openapi.editor.ex.EditorEx; import com.intellij.openapi.project.Project; +import com.intellij.openapi.roots.ProjectRootManager; +import com.intellij.openapi.util.registry.Registry; +import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.vfs.VirtualFileAdapter; import com.intellij.openapi.vfs.VirtualFileEvent; import com.intellij.openapi.vfs.VirtualFileManager; @@ -43,9 +46,13 @@ public class ConfigProjectComponent implements ProjectComponent { } private void updateOpenEditors(VirtualFileEvent event) { - if (".editorconfig".equals(event.getFile().getName())) { - for (Editor editor : editorFactory.getAllEditors()) { - ((EditorEx)editor).reinitSettings(); + final VirtualFile file = event.getFile(); + if (".editorconfig".equals(file.getName())) { + if (ProjectRootManager.getInstance(project).getFileIndex().isInContent(file) || + !Registry.is("editor.config.stop.at.project.root")) { + for (Editor editor : editorFactory.getAllEditors()) { + ((EditorEx)editor).reinitSettings(); + } } } }