From 03be93691c2aaa77e2f5ec485a8b665cc29ad061 Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Wed, 15 Jun 2022 15:14:28 +0200
Subject: [PATCH] SourceControlInputBox API finalization (#152171)

---
 extensions/git/package.json                   |  1 -
 extensions/git/tsconfig.json                  |  1 -
 src/vs/workbench/api/common/extHostSCM.ts     |  2 --
 .../common/extensionsApiProposals.ts          |  1 -
 src/vscode-dts/vscode.d.ts                    |  5 +++++
 src/vscode-dts/vscode.proposed.scmInput.d.ts  | 20 -------------------
 6 files changed, 5 insertions(+), 25 deletions(-)
 delete mode 100644 src/vscode-dts/vscode.proposed.scmInput.d.ts

diff --git a/extensions/git/package.json b/extensions/git/package.json
index 00464a5d1e6..603b8d62ed4 100644
--- a/extensions/git/package.json
+++ b/extensions/git/package.json
@@ -14,7 +14,6 @@
     "contribMergeEditorToolbar",
     "contribViewsWelcome",
     "scmActionButton",
-    "scmInput",
     "scmSelectedProvider",
     "scmValidation",
     "timeline"
diff --git a/extensions/git/tsconfig.json b/extensions/git/tsconfig.json
index 1f1c02d3356..13997275056 100644
--- a/extensions/git/tsconfig.json
+++ b/extensions/git/tsconfig.json
@@ -12,7 +12,6 @@
 		"../../src/vscode-dts/vscode.d.ts",
 		"../../src/vscode-dts/vscode.proposed.diffCommand.d.ts",
 		"../../src/vscode-dts/vscode.proposed.scmActionButton.d.ts",
-		"../../src/vscode-dts/vscode.proposed.scmInput.d.ts",
 		"../../src/vscode-dts/vscode.proposed.scmSelectedProvider.d.ts",
 		"../../src/vscode-dts/vscode.proposed.scmValidation.d.ts",
 		"../../src/vscode-dts/vscode.proposed.tabs.d.ts",
diff --git a/src/vs/workbench/api/common/extHostSCM.ts b/src/vs/workbench/api/common/extHostSCM.ts
index db595e3c9a5..5b033610f37 100644
--- a/src/vs/workbench/api/common/extHostSCM.ts
+++ b/src/vs/workbench/api/common/extHostSCM.ts
@@ -252,12 +252,10 @@ export class ExtHostSCMInputBox implements vscode.SourceControlInputBox {
 	private _enabled: boolean = true;
 
 	get enabled(): boolean {
-		checkProposedApiEnabled(this._extension, 'scmInput');
 		return this._enabled;
 	}
 
 	set enabled(enabled: boolean) {
-		checkProposedApiEnabled(this._extension, 'scmInput');
 		enabled = !!enabled;
 
 		if (this._enabled === enabled) {
diff --git a/src/vs/workbench/services/extensions/common/extensionsApiProposals.ts b/src/vs/workbench/services/extensions/common/extensionsApiProposals.ts
index 8fcd4d47199..080d4b9f534 100644
--- a/src/vs/workbench/services/extensions/common/extensionsApiProposals.ts
+++ b/src/vs/workbench/services/extensions/common/extensionsApiProposals.ts
@@ -47,7 +47,6 @@ export const allApiProposals = Object.freeze({
 	quickPickSortByLabel: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.quickPickSortByLabel.d.ts',
 	resolvers: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.resolvers.d.ts',
 	scmActionButton: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.scmActionButton.d.ts',
-	scmInput: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.scmInput.d.ts',
 	scmSelectedProvider: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.scmSelectedProvider.d.ts',
 	scmValidation: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.scmValidation.d.ts',
 	snippetWorkspaceEdit: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.snippetWorkspaceEdit.d.ts',
diff --git a/src/vscode-dts/vscode.d.ts b/src/vscode-dts/vscode.d.ts
index cac3633e6a3..d701f46f418 100644
--- a/src/vscode-dts/vscode.d.ts
+++ b/src/vscode-dts/vscode.d.ts
@@ -13770,6 +13770,11 @@ declare module 'vscode' {
 		 */
 		placeholder: string;
 
+		/**
+		 * Controls whether the input box is enabled (default is `true`).
+		 */
+		enabled: boolean;
+
 		/**
 		 * Controls whether the input box is visible (default is `true`).
 		 */
diff --git a/src/vscode-dts/vscode.proposed.scmInput.d.ts b/src/vscode-dts/vscode.proposed.scmInput.d.ts
deleted file mode 100644
index 6efdb57ae45..00000000000
--- a/src/vscode-dts/vscode.proposed.scmInput.d.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-declare module 'vscode' {
-
-	// https://github.com/microsoft/vscode/issues/150268
-
-	/**
-	 * Represents the input box in the Source Control viewlet.
-	 */
-	export interface SourceControlInputBox {
-
-		/**
-		 * Controls whether the input box is enabled (default is `true`).
-		 */
-		enabled: boolean;
-	}
-}