From 829a4b50b0d3744d114ac8fedf87e0ec721f157e Mon Sep 17 00:00:00 2001
From: Eric Amodio <eamodio@gmail.com>
Date: Wed, 2 Oct 2019 13:56:01 -0400
Subject: [PATCH] Changes for upcoming TypeScript 3.7

---
 src/git/git.ts                        |  1 -
 src/quickpicks/commitQuickPick.ts     |  3 +--
 src/quickpicks/commonQuickPicks.ts    | 12 +++++++-----
 src/quickpicks/repoStatusQuickPick.ts |  4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/git/git.ts b/src/git/git.ts
index 7c03c23..a0c13ad 100644
--- a/src/git/git.ts
+++ b/src/git/git.ts
@@ -11,7 +11,6 @@ import { run, RunOptions } from './shell';
 import { GitBranchParser, GitLogParser, GitReflogParser, GitStashParser } from './parsers/parsers';
 import { GitFileStatus } from './models/file';
 
-export type GitLocation = GitLocation;
 export * from './models/models';
 export * from './parsers/parsers';
 export * from './remotes/provider';
diff --git a/src/quickpicks/commitQuickPick.ts b/src/quickpicks/commitQuickPick.ts
index 7fa7db8..03947bf 100644
--- a/src/quickpicks/commitQuickPick.ts
+++ b/src/quickpicks/commitQuickPick.ts
@@ -1,6 +1,6 @@
 'use strict';
 import * as paths from 'path';
-import { commands, TextDocumentShowOptions, TextEditor, Uri, window } from 'vscode';
+import { commands, QuickPickItem, TextDocumentShowOptions, TextEditor, Uri, window } from 'vscode';
 import {
 	Commands,
 	CopyMessageToClipboardCommandArgs,
@@ -32,7 +32,6 @@ import {
 	getQuickPickIgnoreFocusOut,
 	KeyCommandQuickPickItem,
 	OpenInSearchCommitsViewQuickPickItem,
-	QuickPickItem,
 	RevealInRepositoriesViewQuickPickItem
 } from './commonQuickPicks';
 import { OpenRemotesCommandQuickPickItem } from './remotesQuickPick';
diff --git a/src/quickpicks/commonQuickPicks.ts b/src/quickpicks/commonQuickPicks.ts
index 3902e64..1cc9af4 100644
--- a/src/quickpicks/commonQuickPicks.ts
+++ b/src/quickpicks/commonQuickPicks.ts
@@ -8,6 +8,13 @@ import { KeyMapping, Keys } from '../keyboard';
 import { ReferencesQuickPick, ReferencesQuickPickItem } from './referencesQuickPick';
 import { GlyphChars } from '../constants';
 
+declare module 'vscode' {
+	interface QuickPickItem {
+		onDidSelect?(): void;
+		onDidPressKey?(key: Keys): Promise<void>;
+	}
+}
+
 export function getQuickPickIgnoreFocusOut() {
 	return !configuration.get('advanced', 'quickPick', 'closeOnFocusOut');
 }
@@ -47,11 +54,6 @@ function _getInfiniteCancellablePromise(cancellation: CancellationTokenSource) {
 	});
 }
 
-export interface QuickPickItem extends QuickPickItem {
-	onDidSelect?(): void;
-	onDidPressKey?(key: Keys): Promise<void>;
-}
-
 export class CommandQuickPickItem implements QuickPickItem {
 	label!: string;
 	description!: string;
diff --git a/src/quickpicks/repoStatusQuickPick.ts b/src/quickpicks/repoStatusQuickPick.ts
index e687de7..55b60dd 100644
--- a/src/quickpicks/repoStatusQuickPick.ts
+++ b/src/quickpicks/repoStatusQuickPick.ts
@@ -1,6 +1,6 @@
 'use strict';
 import * as paths from 'path';
-import { commands, TextDocumentShowOptions, TextEditor, window } from 'vscode';
+import { commands, QuickPickItem, TextDocumentShowOptions, TextEditor, window } from 'vscode';
 import {
 	Commands,
 	DiffWithPreviousCommandArgs,
@@ -23,7 +23,7 @@ import {
 } from '../git/gitService';
 import { Keys } from '../keyboard';
 import { Iterables, Strings } from '../system';
-import { CommandQuickPickItem, getQuickPickIgnoreFocusOut, QuickPickItem } from './commonQuickPicks';
+import { CommandQuickPickItem, getQuickPickIgnoreFocusOut } from './commonQuickPicks';
 
 export class OpenStatusFileCommandQuickPickItem extends CommandQuickPickItem {
 	readonly status: GitStatusFile;