From c2af70a8c6e25ef6f9bb9ac31e09c40fd305d1bd Mon Sep 17 00:00:00 2001 From: Aleksey Pivovarov Date: Mon, 26 Feb 2018 19:21:01 +0300 Subject: [PATCH] lst: update CLM when directory is renamed * we should track rename/movement events for parents as well EA-116756 - assert: ChangeListWorker.registerChangeTracker EA-116749 - assert: ChangeListWorker.unregisterChangeTracker follow-up: b3967042427be227db6b2114a031ddba2b08153c --- .../openapi/vcs/impl/LineStatusTrackerManager.kt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) 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 69d448a000da..4a078c6a9605 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 @@ -654,10 +654,11 @@ class LineStatusTrackerManager( if (!partialChangeListsEnabled) return synchronized(LOCK) { - val document = fileDocumentManager.getCachedDocument(file) ?: return - val data = trackers[document] ?: return - - reregisterTrackerInCLM(data) + for (data in trackers.values) { + if (VfsUtil.isAncestor(file, data.tracker.virtualFile, false)) { + reregisterTrackerInCLM(data) + } + } } } }