Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-08 09:08:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove some comments

Browse Source
This commit is contained in:
Daniel Imms
2018-07-11 11:35:50 -07:00
parent 2fb8ab5124
commit 84a7a188f8
4 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/gulpfile.vscode.js
-1
View File
@@ -78,7 +78,6 @@ const vscodeResources = [
'out-build/vs/workbench/parts/webview/electron-browser/webview-pre.js',
'out-build/vs/**/markdown.css',
'out-build/vs/workbench/parts/tasks/**/*.json',
// 'out-build/vs/workbench/parts/terminal/electron-browser/terminalProcess.js',
'out-build/vs/workbench/parts/welcome/walkThrough/**/*.md',
'out-build/vs/workbench/services/files/**/*.exe',
'out-build/vs/workbench/services/files/**/*.md',
src/vs/workbench/api/node/extHostTerminalService.ts
+1 -10
View File
@@ -397,10 +397,6 @@ export class ExtHostTerminalService implements ExtHostTerminalServiceShape {
// Fork the process and listen for messages
this._logService.debug(`Terminal process launching on ext host`, options);
this._terminalProcesses[id] = new TerminalProcess(shellLaunchConfig.executable, shellLaunchConfig.args, cwd, cols, rows);
// this._terminalProcesses[id].on
// this._terminalProcesses[id].on('message', (message: IMessageFromTerminalProcess) => {
// switch (message.type) {
// });
this._terminalProcesses[id].onProcessIdReady(pid => this._proxy.$sendProcessPid(id, pid));
this._terminalProcesses[id].onProcessTitleChanged(title => this._proxy.$sendProcessTitle(id, title));
this._terminalProcesses[id].onProcessData(data => this._proxy.$sendProcessData(id, data));
@@ -410,7 +406,6 @@ export class ExtHostTerminalService implements ExtHostTerminalServiceShape {
public $acceptProcessInput(id: number, data: string): void {
if (this._terminalProcesses[id].isConnected) {
this._terminalProcesses[id].input(data);
// this._terminalProcesses[id].send({ event: 'input', data });
}
}
@@ -418,7 +413,6 @@ export class ExtHostTerminalService implements ExtHostTerminalServiceShape {
if (this._terminalProcesses[id].isConnected) {
try {
this._terminalProcesses[id].resize(cols, rows);
// this._terminalProcesses[id].send({ event: 'resize', cols, rows });
} catch (error) {
// We tried to write to a closed pipe / channel.
if (error.code !== 'EPIPE' && error.code !== 'ERR_IPC_CHANNEL_CLOSED') {
@@ -431,15 +425,12 @@ export class ExtHostTerminalService implements ExtHostTerminalServiceShape {
public $acceptProcessShutdown(id: number): void {
if (this._terminalProcesses[id].isConnected) {
this._terminalProcesses[id].shutdown();
// this._terminalProcesses[id].send({ event: 'shutdown' });
}
}
private _onProcessExit(id: number, exitCode: number): void {
// Remove listeners
// const process = this._terminalProcesses[id];
// process.removeAllListeners('message');
// process.removeAllListeners('exit');
this._terminalProcesses[id].dispose();
// Remove process reference
delete this._terminalProcesses[id];
src/vs/workbench/parts/terminal/electron-browser/terminalProcessManager.ts
+1 -1
View File
@@ -122,7 +122,7 @@ export class TerminalProcessManager implements ITerminalProcessManager {
const options = { env, cwd };
this._logService.debug(`Terminal process launching`, options);
// this._process = cp.fork(Uri.parse(require.toUrl('bootstrap')).fsPath, ['--type=terminal'], options);
// TODO: Send right args (on ext host too)
this._process = new TerminalProcess(env['PTYSHELL'], [], env['PTYCWD'], cols, rows);
}
this.processState = ProcessState.LAUNCHING;
src/vs/workbench/parts/terminal/node/terminalProcess.ts
+9 -1
View File
@@ -9,8 +9,9 @@ import * as pty from 'node-pty';
import { Event, Emitter } from 'vs/base/common/event';
import { IProcessEnvironment } from 'vs/base/common/platform';
import { ITerminalChildProcess } from 'vs/workbench/parts/terminal/node/terminal';
import { IDisposable } from 'vs/base/common/lifecycle';
export class TerminalProcess implements ITerminalChildProcess {
export class TerminalProcess implements ITerminalChildProcess, IDisposable {
private _exitCode: number;
private _closeTimeout: number;
private _ptyProcess: pty.IPty;
@@ -65,6 +66,13 @@ export class TerminalProcess implements ITerminalChildProcess {
this._setupTitlePolling();
}
public dispose(): void {
this._onProcessData.dispose();
this._onProcessExit.dispose();
this._onProcessIdReady.dispose();
this._onProcessTitleChanged.dispose();
}
private _createEnv(): IProcessEnvironment {
const env: IProcessEnvironment = { ...process.env };
const keysToRemove = [