From 5fb6b29f2de5512db85f34563b520ad646d1e0da Mon Sep 17 00:00:00 2001 From: Aleksey Pivovarov Date: Fri, 16 Mar 2018 15:23:49 +0300 Subject: [PATCH] lst: check if tracker can be released after base content loading This fixes blinking `LineStatusTrackerManagerTest.test partial tracker lifecycle - editor for modified file`. --- .../com/intellij/openapi/vcs/impl/LineStatusTrackerManager.kt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/LineStatusTrackerManager.kt b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/LineStatusTrackerManager.kt index 47d27811cfde..bf9d715eb0d5 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/LineStatusTrackerManager.kt +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/LineStatusTrackerManager.kt @@ -552,6 +552,8 @@ class LineStatusTrackerManager( tracker.restoreState(state) log("Loading canceled: state restored", virtualFile) } + + checkIfTrackerCanBeReleased(document) } is Result.Error -> { synchronized(LOCK) { @@ -592,6 +594,8 @@ class LineStatusTrackerManager( log("Loading finished: state restored", virtualFile) } } + + checkIfTrackerCanBeReleased(document) } } }