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

EA-85204 - TDDE: TraceableDisposable.throwDisposalError

Browse Source
This commit is contained in:
Dmitry Batrak
2016-06-30 16:06:55 +03:00
parent 735ce3d0a6
commit fb989a963c
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorHistoryManager.java
+3 -1
View File
@@ -137,8 +137,10 @@ public final class EditorHistoryManager implements PersistentStateComponent<Elem
for (int i = states.length - 1; i >= 0; i--) { for (int i = states.length - 1; i >= 0; i--) {
final FileEditorProvider provider = oldProviders [i]; final FileEditorProvider provider = oldProviders [i];
LOG.assertTrue(provider != null); LOG.assertTrue(provider != null);
FileEditor editor = editors[i];
if (!editor.isValid()) continue;
providers[i] = provider; providers[i] = provider;
states[i] = editors[i].getState(FileEditorStateLevel.FULL); states[i] = editor.getState(FileEditorStateLevel.FULL);
} }
addEntry(HistoryEntry.createHeavy(myProject, file, providers, states, providers[selectedProviderIndex])); addEntry(HistoryEntry.createHeavy(myProject, file, providers, states, providers[selectedProviderIndex]));
trimToSize(); trimToSize();
platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/HistoryEntry.java
+5 -1
View File
@@ -105,7 +105,11 @@ final class HistoryEntry {
HistoryEntry entry = new HistoryEntry(pointer, selectedProvider, disposable); HistoryEntry entry = new HistoryEntry(pointer, selectedProvider, disposable);
for (int i = 0; i < providers.length; i++) { for (int i = 0; i < providers.length; i++) {
entry.putState(providers[i], states[i]); FileEditorProvider provider = providers[i];
FileEditorState state = states[i];
if (provider != null && state != null) {
entry.putState(provider, state);
}
} }
return entry; return entry;
} }