Merge pull request #116373 from microsoft/tyriar/megan

Move local terminal processes to live under the new ptyHost process

Author: Tyriar

extensions/vscode-api-tests/src/singlefolder-tests/terminal.test.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { window, Pseudoterminal, EventEmitter, TerminalDimensions, workspace, ConfigurationTarget, Disposable, UIKind, env, EnvironmentVariableMutatorType, EnvironmentVariableMutator, extensions, ExtensionContext, TerminalOptions, ExtensionTerminalOptions, Terminal } from 'vscode';
-import { doesNotThrow, equal, deepEqual, throws } from 'assert';
+import { doesNotThrow, equal, deepEqual, throws, strictEqual } from 'assert';
 import { assertNoRpc } from '../utils';
 
 // Disable terminal tests:
@@ -19,8 +19,6 @@ import { assertNoRpc } from '../utils';
 		extensionContext = (global as any).testExtensionContext;
 
 		const config = workspace.getConfiguration('terminal.integrated');
-		// Disable conpty in integration tests because of https://github.com/microsoft/vscode/issues/76548
-		await config.update('windowsEnableConpty', false, ConfigurationTarget.Global);
 		// Disable exit alerts as tests may trigger then and we're not testing the notifications
 		await config.update('showExitAlert', false, ConfigurationTarget.Global);
 		// Canvas may cause problems when running in a container
@@ -57,49 +55,43 @@ import { assertNoRpc } from '../utils';
 			});
 		});
 
-		(process.platform === 'linux' ? test.skip : test)('echo works in the default shell', (done) => {
-			disposables.push(window.onDidOpenTerminal(term => {
-				try {
-					equal(terminal, term);
-				} catch (e) {
-					done(e);
-					return;
-				}
-				let data = '';
-				const dataDisposable = window.onDidWriteTerminalData(e => {
-					try {
-						equal(terminal, e.terminal);
-					} catch (e) {
-						done(e);
-						return;
-					}
-					data += e.data;
-					if (data.indexOf(expected) !== 0) {
-						dataDisposable.dispose();
-						terminal.dispose();
-						disposables.push(window.onDidCloseTerminal(() => {
-							done();
-						}));
-					}
+		test('echo works in the default shell', async () => {
+			const terminal = await new Promise<Terminal>(r => {
+				disposables.push(window.onDidOpenTerminal(t => {
+					strictEqual(terminal, t);
+					r(terminal);
+				}));
+				// Use a single character to avoid winpty/conpty issues with injected sequences
+				const terminal = window.createTerminal({
+					env: { TEST: '`' }
 				});
-				disposables.push(dataDisposable);
-			}));
-			// Use a single character to avoid winpty/conpty issues with injected sequences
-			const expected = '`';
-			const terminal = window.createTerminal({
-				env: {
-					TEST: '`'
-				}
+				terminal.show();
 			});
-			terminal.show();
-			doesNotThrow(() => {
+
+			let data = '';
+			await new Promise<void>(r => {
+				disposables.push(window.onDidWriteTerminalData(e => {
+					strictEqual(terminal, e.terminal);
+					data += e.data;
+					if (data.indexOf('`') !== 0) {
+						r();
+					}
+				}));
 				// Print an environment variable value so the echo statement doesn't get matched
 				if (process.platform === 'win32') {
 					terminal.sendText(`$env:TEST`);
 				} else {
 					terminal.sendText(`echo $TEST`);
 				}
 			});
+
+			await new Promise<void>(r => {
+				terminal.dispose();
+				disposables.push(window.onDidCloseTerminal(t => {
+					strictEqual(terminal, t);
+					r();
+				}));
+			});
 		});
 
 		test('onDidCloseTerminal event fires when terminal is disposed', async () => {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "code-oss-dev",
   "version": "1.54.0",
-  "distro": "918cb1526e6442d55ef2c4e617f77afe48f6a3fe",
+  "distro": "bb7724655cd33d9e9fa31c98ca48a306147c276a",
   "author": {
     "name": "Microsoft Corporation"
   },
@@ -222,4 +222,4 @@
     "elliptic": "^6.5.3",
     "nwmatcher": "^1.4.4"
   }
-}
+}

src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts

@@ -80,6 +80,9 @@ import { DeprecatedExtensionsCleaner } from 'vs/code/electron-browser/sharedProc
 import { onUnexpectedError, setUnexpectedErrorHandler } from 'vs/base/common/errors';
 import { toErrorMessage } from 'vs/base/common/errorMessage';
 import { join } from 'vs/base/common/path';
+import { TerminalIpcChannels } from 'vs/platform/terminal/common/terminal';
+import { LocalPtyService } from 'vs/platform/terminal/electron-browser/localPtyService';
+import { ILocalPtyService } from 'vs/platform/terminal/electron-sandbox/terminal';
 import { UserDataSyncChannel } from 'vs/platform/userDataSync/common/userDataSyncServiceIpc';
 
 class SharedProcessMain extends Disposable {
@@ -259,6 +262,10 @@ class SharedProcessMain extends Disposable {
 		services.set(IUserDataSyncResourceEnablementService, new SyncDescriptor(UserDataSyncResourceEnablementService));
 		services.set(IUserDataSyncService, new SyncDescriptor(UserDataSyncService));
 
+		// Terminal
+		const localPtyService = this._register(new LocalPtyService(logService));
+		services.set(ILocalPtyService, localPtyService);
+
 		return new InstantiationService(services);
 	}
 
@@ -296,6 +303,11 @@ class SharedProcessMain extends Disposable {
 		const userDataAutoSync = this._register(accessor.get(IInstantiationService).createInstance(UserDataAutoSyncService));
 		const userDataAutoSyncChannel = new UserDataAutoSyncChannel(userDataAutoSync);
 		this.server.registerChannel('userDataAutoSync', userDataAutoSyncChannel);
+
+		// Terminal
+		const localPtyService = accessor.get(ILocalPtyService);
+		const localPtyChannel = ProxyChannel.fromService(localPtyService);
+		this.server.registerChannel(TerminalIpcChannels.LocalPty, localPtyChannel);
 	}
 
 	private registerErrorHandler(logService: ILogService): void {