From 06aadb28a71b09ab3f97a6c0869a8a4a2fa8ba61 Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Mon, 28 Oct 2019 09:54:13 +0100 Subject: [PATCH] debt - prepare for node 12 --- src/vs/base/browser/markdownRenderer.ts | 2 +- src/vs/base/node/decoder.ts | 2 +- src/vs/base/node/processes.ts | 4 ++-- src/vs/base/test/node/pfs/pfs.test.ts | 8 ++++---- src/vs/code/node/cli.ts | 4 ++-- .../extensionManagement/node/extensionLifecycle.ts | 8 ++++---- .../files/node/watcher/win32/csharpWatcherService.ts | 4 ++-- src/vs/workbench/contrib/debug/node/debugAdapter.ts | 10 +++++----- .../contrib/preferences/browser/preferencesEditor.ts | 2 +- .../terminal/electron-browser/terminalNativeService.ts | 2 +- .../services/editor/test/browser/editorService.test.ts | 2 +- .../extensions/electron-browser/extensionHost.ts | 8 ++++---- .../services/search/node/ripgrepTextSearchEngine.ts | 6 +++--- 13 files changed, 31 insertions(+), 31 deletions(-) diff --git a/src/vs/base/browser/markdownRenderer.ts b/src/vs/base/browser/markdownRenderer.ts index 9d500ca5985..57144d67ea6 100644 --- a/src/vs/base/browser/markdownRenderer.ts +++ b/src/vs/base/browser/markdownRenderer.ts @@ -68,7 +68,7 @@ export function renderMarkdown(markdown: IMarkdownString, options: MarkdownRende // signal to code-block render that the // element has been created let signalInnerHTML: () => void; - const withInnerHTML = new Promise(c => signalInnerHTML = c); + const withInnerHTML = new Promise(c => signalInnerHTML = c); const renderer = new marked.Renderer(); renderer.image = (href: string, title: string, text: string) => { diff --git a/src/vs/base/node/decoder.ts b/src/vs/base/node/decoder.ts index 5146d0e24de..0e313a5715a 100644 --- a/src/vs/base/node/decoder.ts +++ b/src/vs/base/node/decoder.ts @@ -59,4 +59,4 @@ export class LineDecoder { end(): string | null { return this.remaining; } -} \ No newline at end of file +} diff --git a/src/vs/base/node/processes.ts b/src/vs/base/node/processes.ts index 09c16c6106e..48972b3e9bd 100644 --- a/src/vs/base/node/processes.ts +++ b/src/vs/base/node/processes.ts @@ -365,11 +365,11 @@ export class LineProcess extends AbstractProcess { protected handleSpawn(childProcess: cp.ChildProcess, cc: ValueCallback, pp: ProgressCallback, ee: ErrorCallback, sync: boolean): void { const stdoutLineDecoder = new LineDecoder(); const stderrLineDecoder = new LineDecoder(); - childProcess.stdout.on('data', (data: Buffer) => { + childProcess.stdout!.on('data', (data: Buffer) => { const lines = stdoutLineDecoder.write(data); lines.forEach(line => pp({ line: line, source: Source.stdout })); }); - childProcess.stderr.on('data', (data: Buffer) => { + childProcess.stderr!.on('data', (data: Buffer) => { const lines = stderrLineDecoder.write(data); lines.forEach(line => pp({ line: line, source: Source.stderr })); }); diff --git a/src/vs/base/test/node/pfs/pfs.test.ts b/src/vs/base/test/node/pfs/pfs.test.ts index 060913bbe72..7144a90f519 100644 --- a/src/vs/base/test/node/pfs/pfs.test.ts +++ b/src/vs/base/test/node/pfs/pfs.test.ts @@ -525,7 +525,7 @@ suite('PFS', () => { } if (!expectedError || (expectedError).code !== 'EISDIR') { - return Promise.reject(new Error('Expected EISDIR error for writing to folder but got: ' + (expectedError ? (expectedError).code : 'no error'))); + throw new Error('Expected EISDIR error for writing to folder but got: ' + (expectedError ? (expectedError).code : 'no error')); } // verify that the stream is still consumable (for https://github.com/Microsoft/vscode/issues/42542) @@ -551,7 +551,7 @@ suite('PFS', () => { } if (!expectedError || expectedError.message !== readError) { - return Promise.reject(new Error('Expected error for writing to folder')); + throw new Error('Expected error for writing to folder'); } await pfs.rimraf(parentDir); @@ -582,7 +582,7 @@ suite('PFS', () => { } if (!expectedError || !((expectedError).code !== 'EACCES' || (expectedError).code !== 'EPERM')) { - return Promise.reject(new Error('Expected EACCES/EPERM error for writing to folder but got: ' + (expectedError ? (expectedError).code : 'no error'))); + throw new Error('Expected EACCES/EPERM error for writing to folder but got: ' + (expectedError ? (expectedError).code : 'no error')); } await pfs.rimraf(parentDir); @@ -609,7 +609,7 @@ suite('PFS', () => { } if (!expectedError) { - return Promise.reject(new Error('Expected error for writing to folder')); + throw new Error('Expected error for writing to folder'); } await pfs.rimraf(parentDir); diff --git a/src/vs/code/node/cli.ts b/src/vs/code/node/cli.ts index 71efcf3bffd..5a6c573b36d 100644 --- a/src/vs/code/node/cli.ts +++ b/src/vs/code/node/cli.ts @@ -135,8 +135,8 @@ export async function main(argv: string[]): Promise { env['ELECTRON_ENABLE_LOGGING'] = '1'; processCallbacks.push(async child => { - child.stdout.on('data', (data: Buffer) => console.log(data.toString('utf8').trim())); - child.stderr.on('data', (data: Buffer) => console.log(data.toString('utf8').trim())); + child.stdout!.on('data', (data: Buffer) => console.log(data.toString('utf8').trim())); + child.stderr!.on('data', (data: Buffer) => console.log(data.toString('utf8').trim())); await new Promise(c => child.once('exit', () => c())); }); diff --git a/src/vs/platform/extensionManagement/node/extensionLifecycle.ts b/src/vs/platform/extensionManagement/node/extensionLifecycle.ts index d252d404a60..25a4468ad4b 100644 --- a/src/vs/platform/extensionManagement/node/extensionLifecycle.ts +++ b/src/vs/platform/extensionManagement/node/extensionLifecycle.ts @@ -98,11 +98,11 @@ export class ExtensionsLifecycle extends Disposable { // Catch all output coming from the process type Output = { data: string, format: string[] }; - extensionUninstallProcess.stdout.setEncoding('utf8'); - extensionUninstallProcess.stderr.setEncoding('utf8'); + extensionUninstallProcess.stdout!.setEncoding('utf8'); + extensionUninstallProcess.stderr!.setEncoding('utf8'); - const onStdout = Event.fromNodeEventEmitter(extensionUninstallProcess.stdout, 'data'); - const onStderr = Event.fromNodeEventEmitter(extensionUninstallProcess.stderr, 'data'); + const onStdout = Event.fromNodeEventEmitter(extensionUninstallProcess.stdout!, 'data'); + const onStderr = Event.fromNodeEventEmitter(extensionUninstallProcess.stderr!, 'data'); // Log output onStdout(data => this.logService.info(extension.identifier.id, extension.manifest.version, `post-${lifecycleType}`, data)); diff --git a/src/vs/platform/files/node/watcher/win32/csharpWatcherService.ts b/src/vs/platform/files/node/watcher/win32/csharpWatcherService.ts index 1948481a857..0b4ea4ca211 100644 --- a/src/vs/platform/files/node/watcher/win32/csharpWatcherService.ts +++ b/src/vs/platform/files/node/watcher/win32/csharpWatcherService.ts @@ -55,7 +55,7 @@ export class OutOfProcessWin32FolderWatcher { const stdoutLineDecoder = new decoder.LineDecoder(); // Events over stdout - this.handle.stdout.on('data', (data: Buffer) => { + this.handle.stdout!.on('data', (data: Buffer) => { // Collect raw events from output const rawEvents: IDiskFileChange[] = []; @@ -99,7 +99,7 @@ export class OutOfProcessWin32FolderWatcher { // Errors this.handle.on('error', (error: Error) => this.onError(error)); - this.handle.stderr.on('data', (data: Buffer) => this.onError(data)); + this.handle.stderr!.on('data', (data: Buffer) => this.onError(data)); // Exit this.handle.on('exit', (code: number, signal: string) => this.onExit(code, signal)); diff --git a/src/vs/workbench/contrib/debug/node/debugAdapter.ts b/src/vs/workbench/contrib/debug/node/debugAdapter.ts index 797c233395d..70ddc23e1b5 100644 --- a/src/vs/workbench/contrib/debug/node/debugAdapter.ts +++ b/src/vs/workbench/contrib/debug/node/debugAdapter.ts @@ -214,14 +214,14 @@ export class ExecutableDebugAdapter extends StreamDebugAdapter { this._onExit.fire(code); }); - this.serverProcess.stdout.on('close', () => { + this.serverProcess.stdout!.on('close', () => { this._onError.fire(new Error('read error')); }); - this.serverProcess.stdout.on('error', error => { + this.serverProcess.stdout!.on('error', error => { this._onError.fire(error); }); - this.serverProcess.stdin.on('error', error => { + this.serverProcess.stdin!.on('error', error => { this._onError.fire(error); }); @@ -231,7 +231,7 @@ export class ExecutableDebugAdapter extends StreamDebugAdapter { // this.serverProcess.stdout.on('data', (data: string) => { // console.log('%c' + sanitize(data), 'background: #ddd; font-style: italic;'); // }); - this.serverProcess.stderr.on('data', (data: string) => { + this.serverProcess.stderr!.on('data', (data: string) => { const channel = outputService.getChannel(ExtensionsChannelId); if (channel) { channel.append(sanitize(data)); @@ -240,7 +240,7 @@ export class ExecutableDebugAdapter extends StreamDebugAdapter { } // finally connect to the DA - this.connect(this.serverProcess.stdout, this.serverProcess.stdin); + this.connect(this.serverProcess.stdout!, this.serverProcess.stdin!); } catch (err) { this._onError.fire(err); diff --git a/src/vs/workbench/contrib/preferences/browser/preferencesEditor.ts b/src/vs/workbench/contrib/preferences/browser/preferencesEditor.ts index 2a58bc35952..abec70f1f28 100644 --- a/src/vs/workbench/contrib/preferences/browser/preferencesEditor.ts +++ b/src/vs/workbench/contrib/preferences/browser/preferencesEditor.ts @@ -634,7 +634,7 @@ class PreferencesRenderersController extends Disposable { if (filterResult) { filterResult.query = filter; - filterResult.exactMatch = searchResult && searchResult.exactMatch; + filterResult.exactMatch = !!searchResult && searchResult.exactMatch; } return filterResult; diff --git a/src/vs/workbench/contrib/terminal/electron-browser/terminalNativeService.ts b/src/vs/workbench/contrib/terminal/electron-browser/terminalNativeService.ts index b43f3a8777e..3787f9ce6a3 100644 --- a/src/vs/workbench/contrib/terminal/electron-browser/terminalNativeService.ts +++ b/src/vs/workbench/contrib/terminal/electron-browser/terminalNativeService.ts @@ -72,7 +72,7 @@ export class TerminalNativeService implements ITerminalNativeService { const proc = execFile('bash.exe', ['-c', `wslpath ${escapeNonWindowsPath(path)}`], {}, (error, stdout, stderr) => { c(escapeNonWindowsPath(stdout.trim())); }); - proc.stdin.end(); + proc.stdin!.end(); }); } diff --git a/src/vs/workbench/services/editor/test/browser/editorService.test.ts b/src/vs/workbench/services/editor/test/browser/editorService.test.ts index 9601ae63122..c55ecf8cc50 100644 --- a/src/vs/workbench/services/editor/test/browser/editorService.test.ts +++ b/src/vs/workbench/services/editor/test/browser/editorService.test.ts @@ -54,7 +54,7 @@ export class TestEditorInput extends EditorInput implements IFileEditorInput { constructor(private resource: URI) { super(); } getTypeId() { return 'testEditorInputForEditorService'; } - resolve(): Promise { return !this.fails ? Promise.resolve(null) : Promise.reject(new Error('fails')); } + resolve(): Promise { return !this.fails ? Promise.resolve(null) : Promise.reject(new Error('fails')); } matches(other: TestEditorInput): boolean { return other && other.resource && this.resource.toString() === other.resource.toString() && other instanceof TestEditorInput; } setEncoding(encoding: string) { } getEncoding() { return undefined; } diff --git a/src/vs/workbench/services/extensions/electron-browser/extensionHost.ts b/src/vs/workbench/services/extensions/electron-browser/extensionHost.ts index be9a826a147..87de5701125 100644 --- a/src/vs/workbench/services/extensions/electron-browser/extensionHost.ts +++ b/src/vs/workbench/services/extensions/electron-browser/extensionHost.ts @@ -170,10 +170,10 @@ export class ExtensionHostProcessWorker implements IExtensionHostStarter { // Catch all output coming from the extension host process type Output = { data: string, format: string[] }; - this._extensionHostProcess.stdout.setEncoding('utf8'); - this._extensionHostProcess.stderr.setEncoding('utf8'); - const onStdout = Event.fromNodeEventEmitter(this._extensionHostProcess.stdout, 'data'); - const onStderr = Event.fromNodeEventEmitter(this._extensionHostProcess.stderr, 'data'); + this._extensionHostProcess.stdout!.setEncoding('utf8'); + this._extensionHostProcess.stderr!.setEncoding('utf8'); + const onStdout = Event.fromNodeEventEmitter(this._extensionHostProcess.stdout!, 'data'); + const onStderr = Event.fromNodeEventEmitter(this._extensionHostProcess.stderr!, 'data'); const onOutput = Event.any( Event.map(onStdout, o => ({ data: `%c${o}`, format: [''] })), Event.map(onStderr, o => ({ data: `%c${o}`, format: ['color: red'] })) diff --git a/src/vs/workbench/services/search/node/ripgrepTextSearchEngine.ts b/src/vs/workbench/services/search/node/ripgrepTextSearchEngine.ts index d89964a436b..e86530d9db7 100644 --- a/src/vs/workbench/services/search/node/ripgrepTextSearchEngine.ts +++ b/src/vs/workbench/services/search/node/ripgrepTextSearchEngine.ts @@ -79,15 +79,15 @@ export class RipgrepTextSearchEngine { cancel(); }); - rgProc.stdout.on('data', data => { + rgProc.stdout!.on('data', data => { ripgrepParser.handleData(data); }); let gotData = false; - rgProc.stdout.once('data', () => gotData = true); + rgProc.stdout!.once('data', () => gotData = true); let stderr = ''; - rgProc.stderr.on('data', data => { + rgProc.stderr!.on('data', data => { const message = data.toString(); this.outputChannel.appendLine(message); stderr += message; -- GitLab