From a2fdb7f7d1fe2551103f6ff90427cbca82b2d326 Mon Sep 17 00:00:00 2001 From: peter Date: Tue, 28 Aug 2012 17:57:15 +0200 Subject: [PATCH] correctly read file type settings when a predefined extension was remapped to another file type (IDEA-89509) --- .../openapi/fileTypes/impl/FileTypeManagerImpl.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeManagerImpl.java index d83c8399beeb..6a61224af2fc 100644 --- a/platform/platform-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeManagerImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeManagerImpl.java @@ -283,6 +283,10 @@ public class FileTypeManagerImpl extends FileTypeManagerEx implements NamedJDOME for (final StandardFileType pair : myStandardFileTypes.values()) { registerFileTypeWithoutNotification(pair.fileType, pair.matchers); } + // Resolve unresolved mappings initialized before certain plugin initialized. + for (final StandardFileType pair : myStandardFileTypes.values()) { + bindUnresolvedMappings(pair.fileType); + } if (loadAllFileTypes()) { restoreStandardFileExtensions(); } @@ -841,7 +845,9 @@ public class FileTypeManagerImpl extends FileTypeManagerEx implements NamedJDOME mySpecialFileTypes.add((FileTypeIdentifiableByVirtualFile)fileType); } - // Resolve unresolved mappings initialized before certain plugin initialized. + } + + private void bindUnresolvedMappings(FileType fileType) { for (FileNameMatcher matcher : new THashSet(myUnresolvedMappings.keySet())) { String name = myUnresolvedMappings.get(matcher); if (Comparing.equal(name, fileType.getName())) {