mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
correctly read file type settings when a predefined extension was remapped to another file type (IDEA-89509)
This commit is contained in:
+7
-1
@@ -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<FileNameMatcher>(myUnresolvedMappings.keySet())) {
|
||||
String name = myUnresolvedMappings.get(matcher);
|
||||
if (Comparing.equal(name, fileType.getName())) {
|
||||
|
||||
Reference in New Issue
Block a user