From dc86b5392884ff9f114be4c80ea9c0e18e34846a Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Thu, 14 May 2020 21:13:19 +0200 Subject: [PATCH] resource bundles: clear document history if editor provider is unloaded (IDEA-240659) IDEA-CR-62584: fix current index to myChangePlaces GitOrigin-RevId: 1e3528be9040085173b8eedb21b29f1140856786 --- .../openapi/fileEditor/impl/IdeDocumentHistoryImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/IdeDocumentHistoryImpl.java b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/IdeDocumentHistoryImpl.java index 88248b888a58..c2ac17aa4b11 100644 --- a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/IdeDocumentHistoryImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/IdeDocumentHistoryImpl.java @@ -166,7 +166,9 @@ public class IdeDocumentHistoryImpl extends IdeDocumentHistory implements Dispos public void extensionRemoved(@NotNull FileEditorProvider provider, @NotNull PluginDescriptor pluginDescriptor) { String editorTypeId = provider.getEditorTypeId(); Predicate clearStatePredicate = e -> editorTypeId.equals(e.getEditorTypeId()); - myChangePlaces.removeIf(clearStatePredicate); + if (myChangePlaces.removeIf(clearStatePredicate)) { + myCurrentIndex = myChangePlaces.size(); + } myBackPlaces.removeIf(clearStatePredicate); myForwardPlaces.removeIf(clearStatePredicate); }