From 9d222aaca875b39822c4bf08cc5a02459ffcb4aa Mon Sep 17 00:00:00 2001 From: Dmitry Avdeev Date: Wed, 25 Apr 2012 10:48:22 +0400 Subject: [PATCH] IDEA-85171 Do not update breadcrumbs for background editors when restoring editors state on IntelliJ IDEA opening kb's change reverted: we should show breadcrumbs for all files that can potentially have html --- .../BreadcrumbsLoaderComponent.java | 23 +------------------ 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/xml/impl/src/com/intellij/xml/breadcrumbs/BreadcrumbsLoaderComponent.java b/xml/impl/src/com/intellij/xml/breadcrumbs/BreadcrumbsLoaderComponent.java index 1492f82e821f..f6ce622fbe95 100644 --- a/xml/impl/src/com/intellij/xml/breadcrumbs/BreadcrumbsLoaderComponent.java +++ b/xml/impl/src/com/intellij/xml/breadcrumbs/BreadcrumbsLoaderComponent.java @@ -2,7 +2,6 @@ package com.intellij.xml.breadcrumbs; import com.intellij.application.options.editor.WebEditorOptions; -import com.intellij.lang.html.HTMLLanguage; import com.intellij.openapi.Disposable; import com.intellij.openapi.components.AbstractProjectComponent; import com.intellij.openapi.fileEditor.*; @@ -11,15 +10,11 @@ import com.intellij.openapi.util.Disposer; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.vfs.impl.http.HttpVirtualFile; import com.intellij.psi.FileViewProvider; -import com.intellij.psi.PsiFile; import com.intellij.psi.PsiManager; -import com.intellij.psi.xml.XmlDocument; -import com.intellij.psi.xml.XmlFile; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import javax.swing.*; -import java.util.List; /** * @author spleaner @@ -73,23 +68,7 @@ public class BreadcrumbsLoaderComponent extends AbstractProjectComponent { final FileViewProvider provider = PsiManager.getInstance(project).findViewProvider(file); - return provider != null - && hasNonEmptyHtml(provider) - && BreadcrumbsXmlWrapper.findInfoProvider(provider) != null; - } - - public static boolean hasNonEmptyHtml(FileViewProvider viewProvider) { - final List files = viewProvider.getAllFiles(); - - if (files.size() < 2) return true; // There is only HTML Language - - for (PsiFile file : files) { - if (file.getLanguage() == HTMLLanguage.INSTANCE && file instanceof XmlFile) { - final XmlDocument xml = ((XmlFile)file).getDocument(); - return xml != null && xml.getRootTag() != null; - } - } - return false; + return provider != null && BreadcrumbsXmlWrapper.findInfoProvider(provider) != null; } } }