debt - use platform over node.js OS

Benjamin Pasero · Benjamin Pasero · commit 7f132c907bce · 2020-06-22T09:04:56.000+02:00
diff --git a/src/vs/base/node/terminalEncoding.ts b/src/vs/base/node/terminalEncoding.ts
@@ -7,7 +7,7 @@
  * This code is also used by standalone cli's. Avoid adding dependencies to keep the size of the cli small.
  */
 import { exec } from 'child_process';
-import * as os from 'os';
+import { isWindows } from 'vs/base/common/platform';
 
 const windowsTerminalEncodings = {
 	'437': 'cp437', // United States
@@ -53,7 +53,7 @@ export async function resolveTerminalEncoding(verbose?: boolean): Promise<string
 	}
 
 	// Windows: educated guess
-	else if (os.platform() === 'win32') {
+	else if (isWindows) {
 		rawEncodingPromise = new Promise<string>(resolve => {
 			if (verbose) {
 				console.log('Running "chcp" to detect terminal encoding...');
diff --git a/src/vs/code/node/cli.ts b/src/vs/code/node/cli.ts
@@ -43,7 +43,7 @@ export async function main(argv: string[]): Promise<any> {
 
 	// Help
 	if (args.help) {
-		const executable = `${product.applicationName}${os.platform() === 'win32' ? '.exe' : ''}`;
+		const executable = `${product.applicationName}${isWindows ? '.exe' : ''}`;
 		console.log(buildHelpMessage(product.nameLong, executable, product.version, OPTIONS));
 	}
 
diff --git a/src/vs/platform/environment/node/argv.ts b/src/vs/platform/environment/node/argv.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as minimist from 'minimist';
-import * as os from 'os';
 import { localize } from 'vs/nls';
+import { isWindows } from 'vs/base/common/platform';
 
 export interface ParsedArgs {
 	_: string[];
@@ -364,7 +364,7 @@ export function buildHelpMessage(productName: string, executableName: string, ve
 	help.push(`${localize('usage', "Usage")}: ${executableName} [${localize('options', "options")}][${localize('paths', 'paths')}...]`);
 	help.push('');
 	if (isPipeSupported) {
-		if (os.platform() === 'win32') {
+		if (isWindows) {
 			help.push(localize('stdinWindows', "To read output from another program, append '-' (e.g. 'echo Hello World | {0} -')", executableName));
 		} else {
 			help.push(localize('stdinUnix', "To read from stdin, append '-' (e.g. 'ps aux | grep code | {0} -')", executableName));
diff --git a/src/vs/workbench/contrib/terminal/node/terminalProcess.ts b/src/vs/workbench/contrib/terminal/node/terminalProcess.ts
@@ -3,7 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as os from 'os';
 import * as path from 'vs/base/common/path';
 import * as platform from 'vs/base/common/platform';
 import * as pty from 'node-pty';
@@ -53,7 +52,7 @@ export class TerminalProcess extends Disposable implements ITerminalChildProcess
 	) {
 		super();
 		let name: string;
-		if (os.platform() === 'win32') {
+		if (platform.isWindows) {
 			name = path.basename(this._shellLaunchConfig.executable || '');
 		} else {
 			// Using 'xterm-256color' here helps ensure that the majority of Linux distributions will use a

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ export async function main(argv: string[]): Promise<any> {`
`43`	`43`
`44`	`44`	`// Help`
`45`	`45`	`if (args.help) {`
`46`		- const executable = `${product.applicationName}${os.platform() === 'win32' ? '.exe' : ''}`;
	`46`	+ const executable = `${product.applicationName}${isWindows ? '.exe' : ''}`;
`47`	`47`	`console.log(buildHelpMessage(product.nameLong, executable, product.version, OPTIONS));`
`48`	`48`	`}`
`49`	`49`