From 965b384091f6c591928048d301d93f0c2f9fb784 Mon Sep 17 00:00:00 2001 From: Rustam Vishnyakov Date: Fri, 14 Mar 2014 13:21:24 +0400 Subject: [PATCH] EnforcedPlainTextFileTypeManager: Use FileContentUtilCore.reparseFiles() instead of makeRootsChange, [CR-CR-IC-4656] comment --- .../EnforcedPlainTextFileTypeManager.java | 26 ++++++++----------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/openapi/file/exclude/EnforcedPlainTextFileTypeManager.java b/platform/lang-impl/src/com/intellij/openapi/file/exclude/EnforcedPlainTextFileTypeManager.java index 67ec99535f03..72c8fd1bf696 100644 --- a/platform/lang-impl/src/com/intellij/openapi/file/exclude/EnforcedPlainTextFileTypeManager.java +++ b/platform/lang-impl/src/com/intellij/openapi/file/exclude/EnforcedPlainTextFileTypeManager.java @@ -24,9 +24,9 @@ import com.intellij.openapi.fileTypes.StdFileTypes; import com.intellij.openapi.project.Project; import com.intellij.openapi.project.ProjectManager; import com.intellij.openapi.project.ProjectManagerListener; -import com.intellij.openapi.roots.ex.ProjectRootManagerEx; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.vfs.VirtualFileWithId; +import com.intellij.util.FileContentUtilCore; import com.intellij.util.containers.ConcurrentWeakHashMap; import com.intellij.util.indexing.FileBasedIndex; import org.jetbrains.annotations.NotNull; @@ -90,22 +90,18 @@ public class EnforcedPlainTextFileTypeManager implements ProjectManagerListener ApplicationManager.getApplication().runWriteAction(new Runnable() { @Override public void run() { - ProjectRootManagerEx.getInstanceEx(project).makeRootsChange(new Runnable() { - @Override - public void run() { - ProjectPlainTextFileTypeManager projectPlainTextFileTypeManager = ProjectPlainTextFileTypeManager.getInstance(project); - for (VirtualFile file : files) { - if (projectPlainTextFileTypeManager.hasProjectContaining(file)) { - ensureProjectFileSetAdded(project, projectPlainTextFileTypeManager); - if (isAdded ? - projectPlainTextFileTypeManager.addFile(file) : - projectPlainTextFileTypeManager.removeFile(file)) { - FileBasedIndex.getInstance().requestReindex(file); - } - } + ProjectPlainTextFileTypeManager projectPlainTextFileTypeManager = ProjectPlainTextFileTypeManager.getInstance(project); + for (VirtualFile file : files) { + if (projectPlainTextFileTypeManager.hasProjectContaining(file)) { + ensureProjectFileSetAdded(project, projectPlainTextFileTypeManager); + if (isAdded ? + projectPlainTextFileTypeManager.addFile(file) : + projectPlainTextFileTypeManager.removeFile(file)) { + FileBasedIndex.getInstance().requestReindex(file); } } - }, false, true); + } + FileContentUtilCore.reparseFiles(files); } }); }