Merge pull request #224744 from microsoft/tyriar/145234_2

Finalize shellIntegration API
microsoft · Aug 7, 2024 · cf347ed · cf347ed
2 parents e94c531 + 929eba4
commit cf347ed
Show file tree

Hide file tree

Showing 7 changed files with 334 additions and 347 deletions.
diff --git a/extensions/git/package.json b/extensions/git/package.json
@@ -35,7 +35,6 @@
     "scmValidation",
     "tabInputMultiDiff",
     "tabInputTextMerge",
-    "terminalShellIntegration",
     "timeline"
   ],
   "categories": [

diff --git a/extensions/git/tsconfig.json b/extensions/git/tsconfig.json
@@ -20,7 +20,6 @@
 		"../../src/vscode-dts/vscode.proposed.scmTextDocument.d.ts",
 		"../../src/vscode-dts/vscode.proposed.tabInputMultiDiff.d.ts",
 		"../../src/vscode-dts/vscode.proposed.tabInputTextMerge.d.ts",
-		"../../src/vscode-dts/vscode.proposed.terminalShellIntegration.d.ts",
 		"../../src/vscode-dts/vscode.proposed.timeline.d.ts",
 		"../../src/vscode-dts/vscode.proposed.quickInputButtonLocation.d.ts",
 		"../types/lib.textEncoder.d.ts"

diff --git a/extensions/vscode-api-tests/package.json b/extensions/vscode-api-tests/package.json
@@ -47,7 +47,6 @@
     "telemetry",
     "terminalDataWriteEvent",
     "terminalDimensions",
-    "terminalShellIntegration",
     "testObserver",
     "textSearchProvider",
     "timeline",

diff --git a/src/vs/platform/extensions/common/extensionsApiProposals.ts b/src/vs/platform/extensions/common/extensionsApiProposals.ts
@@ -356,9 +356,6 @@ const _allApiProposals = {
 	terminalSelection: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.terminalSelection.d.ts',
 	},
-	terminalShellIntegration: {
-		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.terminalShellIntegration.d.ts',
-	},
 	testMessageStackTrace: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.testMessageStackTrace.d.ts',
 	},

diff --git a/src/vs/workbench/api/common/extHost.api.impl.ts b/src/vs/workbench/api/common/extHost.api.impl.ts
@@ -743,15 +743,12 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 				return _asExtensionEvent(extHostTerminalService.onDidExecuteTerminalCommand)(listener, thisArg, disposables);
 			},
 			onDidChangeTerminalShellIntegration(listener, thisArg?, disposables?) {
-				checkProposedApiEnabled(extension, 'terminalShellIntegration');
 				return _asExtensionEvent(extHostTerminalShellIntegration.onDidChangeTerminalShellIntegration)(listener, thisArg, disposables);
 			},
 			onDidStartTerminalShellExecution(listener, thisArg?, disposables?) {
-				checkProposedApiEnabled(extension, 'terminalShellIntegration');
 				return _asExtensionEvent(extHostTerminalShellIntegration.onDidStartTerminalShellExecution)(listener, thisArg, disposables);
 			},
 			onDidEndTerminalShellExecution(listener, thisArg?, disposables?) {
-				checkProposedApiEnabled(extension, 'terminalShellIntegration');
 				return _asExtensionEvent(extHostTerminalShellIntegration.onDidEndTerminalShellExecution)(listener, thisArg, disposables);
 			},
 			get state() {