Additional progress reporting during workspace search

microsoft · Aug 14, 2020 · 1cdaf0a · 1cdaf0a
1 parent c299ccb
commit 1cdaf0a
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 6 deletions.
diff --git a/plugin/resources/com/microsoft/alm/plugin/idea/ui/tfplugin.properties b/plugin/resources/com/microsoft/alm/plugin/idea/ui/tfplugin.properties
@@ -209,6 +209,7 @@ Tfvc.Lock.Dialog.LockButton=Lock
 Tfvc.Lock.Dialog.UnlockButton=Unlock
 
 # TFVC Import Workspace Action
+Actions.Tfvc.DetermineWorkspace.Title=Looking for Possible TFVC Workspaces
 Actions.Tfvc.ImportWorkspace.Title=Import TFVC Workspace
 Tfvc.WorkspaceNotDetected=Workspace could not be determined from the current directory. Make sure you have the right directory selected and the right Visual Studio TF client configured.
 

diff --git a/plugin/src/com/microsoft/alm/plugin/idea/common/resources/TfPluginBundle.java b/plugin/src/com/microsoft/alm/plugin/idea/common/resources/TfPluginBundle.java
@@ -124,6 +124,8 @@ public static String message(@NotNull @PropertyKey(resourceBundle = BUNDLE_NAME)
     @NonNls
     public static final String KEY_TFVC_ACTION_ADD_TO_TFIGNORE = "Tfvc.Action.AddToTfIgnore";
     @NonNls
+    public static final String KEY_TFVC_DETERMINE_WORKSPACE_TITLE = "Actions.Tfvc.DetermineWorkspace.Title";
+    @NonNls
     public static final String KEY_TFVC_IMPORT_WORKSPACE_TITLE = "Actions.Tfvc.ImportWorkspace.Title";
     @NonNls
     public static final String KEY_TFVC_REPOSITORY_IMPORT_ERROR = "Tfvc.RepositoryImportError";

diff --git a/plugin/src/com/microsoft/alm/plugin/idea/tfvc/core/TfvcIntegrationEnabler.java b/plugin/src/com/microsoft/alm/plugin/idea/tfvc/core/TfvcIntegrationEnabler.java
@@ -9,6 +9,7 @@
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.options.ShowSettingsUtil;
 import com.intellij.openapi.progress.ProgressIndicator;
+import com.intellij.openapi.progress.ProgressManager;
 import com.intellij.openapi.progress.Task;
 import com.intellij.openapi.progress.impl.ProgressManagerImpl;
 import com.intellij.openapi.project.Project;
@@ -50,6 +51,7 @@
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
+import java.util.concurrent.atomic.AtomicReference;
 
 import static java.util.stream.Collectors.toList;
 
@@ -86,12 +88,19 @@ public void enable(@NotNull Collection<? extends VcsRoot> vcsRoots) {
             return;
         }
 
-        Path workspacePath = determineWorkspaceDirectory(Paths.get(basePath));
-        VirtualFile workspaceFile = ObjectUtils.notNull(
-                LocalFileSystem.getInstance().findFileByIoFile(workspacePath.toFile()));
+        AtomicReference<VirtualFile> workspaceFile = new AtomicReference<>();
+        ProgressManager.getInstance().run(new Task.Modal(myProject, TfPluginBundle.message(TfPluginBundle.KEY_TFVC_DETERMINE_WORKSPACE_TITLE), true) {
+            @Override
+            public void run(@NotNull ProgressIndicator indicator) {
+                Path workspacePath = determineWorkspaceDirectory(Paths.get(basePath), indicator);
+                workspaceFile.set(ObjectUtils.notNull(
+                        LocalFileSystem.getInstance().findFileByIoFile(workspacePath.toFile())));
+                indicator.checkCanceled();
+            }
+        });
 
-        if (initOrNotifyError(workspaceFile))
-            addVcsRoot(workspaceFile);
+        if (initOrNotifyError(workspaceFile.get()))
+            addVcsRoot(workspaceFile.get());
     }
 
     private void showVsAuthenticationErrorDialog(Path path) {
@@ -117,10 +126,12 @@ private CompletionStage<Workspace> getVsWorkspaceAsync(Path vsClient, Path path)
     }
 
     @NotNull
-    private Path determineWorkspaceDirectory(@NotNull Path projectBasePath) {
+    private Path determineWorkspaceDirectory(@NotNull Path projectBasePath, @NotNull ProgressIndicator indicator) {
         Path vsClient = VisualStudioTfvcClient.getOrDetectPath(PropertyService.getInstance());
         Path path = projectBasePath;
         do {
+            indicator.checkCanceled();
+
             Workspace workspace = null;
             try {
                 ourLogger.info("Analyzing path \"" + path + "\" using TF Everywhere client");