From 87cd55f335a96ad48a883fc95cba0a6596f420db Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Wed, 18 May 2016 21:30:36 +0300 Subject: [PATCH] IDEA-156244 Install the VcsDirtyScopeVfsListener on project open This was broken in 9f7a972e when project component became a project service without any explicit initialization. --- .../openapi/vcs/changes/VcsDirtyScopeManagerImpl.java | 1 + .../openapi/vcs/changes/VcsDirtyScopeVfsListener.java | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/VcsDirtyScopeManagerImpl.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/VcsDirtyScopeManagerImpl.java index 78ee87bd32d3..97b13359f297 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/VcsDirtyScopeManagerImpl.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/VcsDirtyScopeManagerImpl.java @@ -77,6 +77,7 @@ public class VcsDirtyScopeManagerImpl extends VcsDirtyScopeManager implements Pr myReady = true; } } + VcsDirtyScopeVfsListener.install(myProject); markEverythingDirty(); } }); diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/VcsDirtyScopeVfsListener.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/VcsDirtyScopeVfsListener.java index a45d648b5d4a..8bda08f65df8 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/VcsDirtyScopeVfsListener.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/VcsDirtyScopeVfsListener.java @@ -80,6 +80,10 @@ public class VcsDirtyScopeVfsListener implements BulkFileListener, Disposable { return ServiceManager.getService(project, VcsDirtyScopeVfsListener.class); } + public static void install(@NotNull Project project) { + getInstance(project); + } + public void setForbid(boolean forbid) { assert ApplicationManager.getApplication().isUnitTestMode(); myForbid = forbid;