Cancels tokens because of vscode api change

See microsoft/vscode#46102

Author: eamodio

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [Unreleased]
+### Fixed
+- Fixes issues where quick pick menu progress indicators will get stuck in some cases because of a vscode api change in [Microsoft/vscode#46102](https://github.com/Microsoft/vscode/pull/46102)
+
 ## [8.2.0] - 2018-03-31
 ### Added
 - Adds new stand-alone *GitLens History* explorer to visualize the history of the current file — undocked version of the *GitLens* explorer history view

src/commands/diffBranchWithBranch.ts

@@ -84,7 +84,7 @@ export class DiffBranchWithBranchCommand extends ActiveEditorCommand {
             return window.showErrorMessage(`Unable to open branch compare. See output channel for more details`);
         }
         finally {
-            progressCancellation && progressCancellation.dispose();
+            progressCancellation && progressCancellation.cancel();
         }
     }
 }

src/commands/diffDirectory.ts

@@ -93,7 +93,7 @@ export class DiffDirectoryCommand extends ActiveEditorCommand {
             return window.showErrorMessage(`Unable to open directory compare. See output channel for more details`);
         }
         finally {
-            progressCancellation && progressCancellation.dispose();
+            progressCancellation && progressCancellation.cancel();
         }
     }
 }

src/commands/diffWithBranch.ts

@@ -85,7 +85,7 @@ export class DiffWithBranchCommand extends ActiveEditorCommand {
             return commands.executeCommand(Commands.DiffWith, diffArgs);
         }
         finally {
-            progressCancellation.dispose();
+            progressCancellation.cancel();
         }
     }
 }

src/commands/diffWithRevision.ts

@@ -115,7 +115,7 @@ export class DiffWithRevisionCommand extends ActiveEditorCommand {
             return window.showErrorMessage(`Unable to open compare. See output channel for more details`);
         }
         finally {
-            progressCancellation.dispose();
+            progressCancellation.cancel();
         }
    }
 }

src/commands/openFileRevision.ts

@@ -137,7 +137,7 @@ export class OpenFileRevisionCommand extends ActiveEditorCommand {
             return window.showErrorMessage(`Unable to open file revision. See output channel for more details`);
         }
         finally {
-            progressCancellation && progressCancellation.dispose();
+            progressCancellation && progressCancellation.cancel();
         }
     }
 }

src/commands/showCommitSearch.ts

@@ -160,7 +160,7 @@ export class ShowCommitSearchCommand extends ActiveEditorCachedCommand {
             return window.showErrorMessage(`Unable to find commits. See output channel for more details`);
         }
         finally {
-            progressCancellation.dispose();
+            progressCancellation.cancel();
         }
     }
 }

src/commands/showQuickBranchHistory.ts

@@ -83,7 +83,7 @@ export class ShowQuickBranchHistoryCommand extends ActiveEditorCachedCommand {
             return window.showErrorMessage(`Unable to show branch history. See output channel for more details`);
         }
         finally {
-            progressCancellation && progressCancellation.dispose();
+            progressCancellation && progressCancellation.cancel();
         }
     }
 }

src/commands/showQuickFileHistory.ts

@@ -107,7 +107,7 @@ export class ShowQuickFileHistoryCommand extends ActiveEditorCachedCommand {
             return window.showErrorMessage(`Unable to show file history. See output channel for more details`);
         }
         finally {
-            progressCancellation.dispose();
+            progressCancellation.cancel();
         }
     }
 }

src/commands/showQuickStashList.ts

@@ -62,7 +62,7 @@ export class ShowQuickStashListCommand extends ActiveEditorCachedCommand {
             return window.showErrorMessage(`Unable to show stashed changes. See output channel for more details`);
         }
         finally {
-            progressCancellation.dispose();
+            progressCancellation.cancel();
         }
     }
 }