MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

TextMate: change extensions between file type change event, not before (EA-217690)

Browse Source 
GitOrigin-RevId: 74af2eb59a17e346a7b32ca2fceea8bdb4bfedf3
This commit is contained in:
Alexander Zolotov
2019-11-22 22:05:14 +00:00
committed by intellij-monorepo-bot
parent 6f359c7a9d
commit 8f1e02e01c
1 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/textmate/src/org/jetbrains/plugins/textmate/TextMateServiceImpl.java
+21 -11
View File
@@ -5,8 +5,8 @@ import com.intellij.notification.NotificationType;
import com.intellij.notification.Notifications;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.ModalityState;
import com.intellij.openapi.application.PathManager;
import com.intellij.openapi.application.TransactionGuard;
import com.intellij.openapi.editor.ex.EditorEx;
import com.intellij.openapi.editor.markup.TextAttributes;
import com.intellij.openapi.fileTypes.FileTypeManager;
@@ -74,11 +74,13 @@ public class TextMateServiceImpl extends TextMateService {
@Override
public void reloadEnabledBundles() {
unregisterAllBundles();
registerBundles(true);
}
private void registerBundles(boolean fireEvents) {
THashMap<String, CharSequence> oldExtensionsMapping = myExtensionsMapping.clone();
unregisterAllBundles();
TextMateSettings settings = TextMateSettings.getInstance();
if (settings == null) {
return;
@@ -97,25 +99,33 @@ public class TextMateServiceImpl extends TextMateService {
}
}
}
if (!myExtensionsMapping.equals(newExtensionsMapping)) {
myExtensionsMapping.clear();
myExtensionsMapping.putAll(newExtensionsMapping);
if (fireEvents && !newExtensionsMapping.isEmpty()) {
fireFileTypesChangedEvent();
if (!oldExtensionsMapping.equals(newExtensionsMapping)) {
Runnable update = () -> {
myExtensionsMapping.clear();
myExtensionsMapping.putAll(newExtensionsMapping);
myExtensionsMapping.trimToSize();
};
if (fireEvents) {
fireFileTypesChangedEvent(update);
}
else {
update.run();
}
}
mySyntaxTable.compact();
myExtensionsMapping.trimToSize();
myCustomHighlightingColors.trimToSize();
}
private static void fireFileTypesChangedEvent() {
TransactionGuard.getInstance().submitTransactionLater(ApplicationManager.getApplication(), () ->
private static void fireFileTypesChangedEvent(@NotNull Runnable update) {
ApplicationManager.getApplication().invokeLater(() -> {
ApplicationManager.getApplication().runWriteAction(() -> {
FileTypeManagerImpl fileTypeManager = (FileTypeManagerImpl)FileTypeManager.getInstance();
fileTypeManager.fireBeforeFileTypesChanged();
update.run();
fileTypeManager.fireFileTypesChanged();
}));
});
}, ModalityState.NON_MODAL);
}
private static void loadBuiltinBundles(TextMateSettings settings) {