Quality check

Author: code-asher

scripts/nbin-shim.js

@@ -1,18 +1,14 @@
-/* global require, global, process, __dirname */
 if (!global.NBIN_LOADED) {
 	try {
 		const nbin = require("nbin");
 		nbin.shimNativeFs("{{ROOT_PATH}}");
 		global.NBIN_LOADED = true;
-
 		const path = require("path");
 		const rg = require("vscode-ripgrep");
 		rg.binaryRgPath = rg.rgPath;
 		rg.rgPath = path.join(
 			require("os").tmpdir(),
-			`code-server/${path.basename(rg.binaryRgPath)}`,
+			`code-server/${path.basename(rg.binaryRgPath)}`
 		);
-	} catch (error) {
-		// Not in the binary.
-	}
+	} catch (error) { /*  Not in the binary. */ }
 }

src/api.ts

@@ -60,7 +60,6 @@ export const vscodeApi = (serviceCollection: ServiceCollection): typeof vscode =
 		FileSystemError: extHostTypes.FileSystemError,
 		FileType: FileType,
 		Uri: URI,
-
 		commands: {
 			executeCommand: (commandId: string, ...args: any[]): any => {
 				return commandService.executeCommand(commandId, ...args);
@@ -69,7 +68,6 @@ export const vscodeApi = (serviceCollection: ServiceCollection): typeof vscode =
 				return CommandsRegistry.registerCommand(id, command);
 			},
 		},
-
 		window: {
 			registerTreeDataProvider: (id: string, dataProvider: ITreeViewDataProvider): void => {
 				const view = viewsRegistry.getView(id);
@@ -81,7 +79,6 @@ export const vscodeApi = (serviceCollection: ServiceCollection): typeof vscode =
 				notificationService.error(message);
 			},
 		},
-
 		workspace: {
 			registerFileSystemProvider: (scheme: string, provider: vscode.FileSystemProvider): IDisposable => {
 				return fileService.registerProvider(scheme, new FileSystemProvider(provider));
@@ -95,21 +92,15 @@ export const vscodeApi = (serviceCollection: ServiceCollection): typeof vscode =
  */
 export const coderApi = (serviceCollection: ServiceCollection): typeof coder => {
 	const getService = <T>(id: ServiceIdentifier<T>): T => serviceCollection.get<T>(id) as T;
-
 	return {
 		workbench: {
 			action: Action,
 			syncActionDescriptor: SyncActionDescriptor,
 			commandRegistry: CommandsRegistry,
 			actionsRegistry: Registry.as<IWorkbenchActionRegistry>(ActionExtensions.WorkbenchActions),
 			registerView: (viewId, viewName, containerId, containerName, icon): void =>  {
-				const viewContainersRegistry = Registry.as<IViewContainersRegistry>(ViewsExtensions.ViewContainersRegistry);
-				const viewsRegistry = Registry.as<IViewsRegistry>(ViewsExtensions.ViewsRegistry);
-				const container = viewContainersRegistry.registerViewContainer(containerId);
-
 				const cssClass = `extensionViewlet-${containerId}`;
 				const id = `workbench.view.extension.${containerId}`;
-
 				class CustomViewlet extends ViewContainerViewlet {
 					public constructor(
 						@IConfigurationService configurationService: IConfigurationService,
@@ -127,44 +118,32 @@ export const coderApi = (serviceCollection: ServiceCollection): typeof coder =>
 					}
 				}
 
-				const viewletDescriptor = new ViewletDescriptor(
-					CustomViewlet as any,
-					id,
-					containerName,
-					cssClass,
-					undefined,
-					URI.parse(icon),
+				Registry.as<ViewletRegistry>(ViewletExtensions.Viewlets).registerViewlet(
+					new ViewletDescriptor(CustomViewlet as any, id, containerName, cssClass, undefined, URI.parse(icon)),
 				);
 
-				Registry.as<ViewletRegistry>(ViewletExtensions.Viewlets).registerViewlet(viewletDescriptor);
-
-				const registry = Registry.as<IWorkbenchActionRegistry>(ActionExtensions.WorkbenchActions);
-				registry.registerWorkbenchAction(
+				Registry.as<IWorkbenchActionRegistry>(ActionExtensions.WorkbenchActions).registerWorkbenchAction(
 					new SyncActionDescriptor(OpenCustomViewletAction as any, id, localize("showViewlet", "Show {0}", containerName)),
 					"View: Show {0}",
 					localize("view", "View"),
 				);
 
-				// Generate CSS to show the icon in the activity bar
+				// Generate CSS to show the icon in the activity bar.
 				const iconClass = `.monaco-workbench .activitybar .monaco-action-bar .action-label.${cssClass}`;
 				createCSSRule(iconClass, `-webkit-mask: url('${icon}') no-repeat 50% 50%`);
 
-				const views = [{
+				const container = Registry.as<IViewContainersRegistry>(ViewsExtensions.ViewContainersRegistry).registerViewContainer(containerId);
+				Registry.as<IViewsRegistry>(ViewsExtensions.ViewsRegistry).registerViews([{
 					id: viewId,
 					name: viewName,
 					ctorDescriptor: { ctor: CustomTreeViewPanel },
 					treeView: getService(IInstantiationService).createInstance(CustomTreeView as any, viewId, container),
-				}] as  ITreeViewDescriptor[];
-				viewsRegistry.registerViews(views, container);
+				}] as ITreeViewDescriptor[], container);
 			},
-			// Even though the enums are exactly the same, Typescript says they are
-			// not assignable to each other, so use `any`. I don't know if there is a
-			// way around this.
 			menuRegistry: MenuRegistry as any,
 			statusbarService: getService(IStatusbarService) as any,
 			notificationService: getService(INotificationService),
 			terminalService: getService(ITerminalService),
-
 			onFileCreate: (cb): void => {
 				getService<IFileService>(IFileService).onAfterOperation((e) => {
 					if (e.operation === FileOperation.CREATE) {
@@ -198,7 +177,6 @@ export const coderApi = (serviceCollection: ServiceCollection): typeof coder =>
 					}
 				});
 			},
-
 			onModelAdded: (cb): void => {
 				getService<IModelService>(IModelService).onModelAdded((e) => {
 					cb(e.uri.path, e.getLanguageIdentifier().language);
@@ -214,15 +192,13 @@ export const coderApi = (serviceCollection: ServiceCollection): typeof coder =>
 					cb(e.model.uri.path, e.model.getLanguageIdentifier().language, e.oldModeId);
 				});
 			},
-
 			onTerminalAdded: (cb): void => {
 				getService<ITerminalService>(ITerminalService).onInstanceCreated(() => cb());
 			},
 			onTerminalRemoved: (cb): void => {
 				getService<ITerminalService>(ITerminalService).onInstanceDisposed(() => cb());
 			},
 		},
-
 		// @ts-ignore
 		MenuId: MenuId,
 		Severity: Severity,
@@ -250,9 +226,7 @@ class FileSystemProvider implements IFileSystemProvider {
 	public readonly capabilities: FileSystemProviderCapabilities;
 	public readonly onDidChangeCapabilities: Event<void> = Event.None;
 
-	public constructor(
-		private readonly provider: vscode.FileSystemProvider,
-	) {
+	public constructor(private readonly provider: vscode.FileSystemProvider) {
 		this.capabilities = FileSystemProviderCapabilities.Readonly;
 	}
 

src/channel.ts

@@ -43,9 +43,6 @@ class Watcher extends DiskFileSystemProvider {
 	}
 }
 
-/**
- * See: src/vs/platform/remote/common/remoteAgentFileSystemChannel.ts.
- */
 export class FileProviderChannel implements IServerChannel, IDisposable {
 	private readonly provider: DiskFileSystemProvider;
 	private readonly watchers = new Map<string, Watcher>();
@@ -175,9 +172,6 @@ export class FileProviderChannel implements IServerChannel, IDisposable {
 	}
 }
 
-/**
- * See: src/vs/workbench/services/remote/common/remoteAgentEnvironmentChannel.ts.
- */
 export class ExtensionEnvironmentChannel implements IServerChannel {
 	public constructor(
 		private readonly environment: IEnvironmentService,
@@ -245,7 +239,6 @@ export class ExtensionEnvironmentChannel implements IServerChannel {
 		};
 
 		return Promise.all([scanBuiltin(), scanInstalled()]).then((allExtensions) => {
-			// It's possible to get duplicates.
 			const uniqueExtensions = new Map<string, IExtensionDescription>();
 			allExtensions.forEach((multipleExtensions) => {
 				multipleExtensions.forEach((extensions) => {
@@ -254,18 +247,13 @@ export class ExtensionEnvironmentChannel implements IServerChannel {
 						if (uniqueExtensions.has(id)) {
 							const oldPath = uniqueExtensions.get(id)!.extensionLocation.fsPath;
 							const newPath = extension.extensionLocation.fsPath;
-							this.log.warn(
-								`Extension ${id} in ${oldPath} has been overridden ${newPath}`,
-							);
+							this.log.warn(`${oldPath} has been overridden ${newPath}`);
 						}
 						uniqueExtensions.set(id, extension);
 					});
 				});
 			});
-
-			const finalExtensions = <IExtensionDescription[]>[];
-			uniqueExtensions.forEach((e) => finalExtensions.push(e));
-			return finalExtensions;
+			return Array.from(uniqueExtensions.values());
 		});
 	}
 

src/cli.ts

@@ -92,12 +92,7 @@ const main = async (): Promise<void> => {
 	const version = `${(pkg as any).codeServerVersion || "development"}-vsc${pkg.version}`;
 	if (args.help) {
 		const executable = `${product.applicationName}${os.platform() === "win32" ? ".exe" : ""}`;
-		return console.log(buildHelpMessage(
-			product.nameLong, executable,
-			version,
-			undefined,
-			false,
-		));
+		return console.log(buildHelpMessage(product.nameLong, executable, version, undefined, false));
 	}
 
 	if (args.version) {
@@ -116,26 +111,22 @@ const main = async (): Promise<void> => {
 	if (shouldSpawnCliProcess()) {
 		const cli = await new Promise<IMainCli>((c, e) => require(["vs/code/node/cliProcessMain"], c, e));
 		await cli.main(args);
-		// There is some WriteStream instance keeping it open so force an exit.
-		return process.exit(0);
+		return process.exit(0); // There is a WriteStream instance keeping it open.
 	}
 
+	const extra = args["_"] || [];
 	const options = {
-		host: args.host,
 		allowHttp: args["allow-http"],
+		auth: typeof args.auth !== "undefined" ? args.auth : true,
 		cert: args.cert,
 		certKey: args["cert-key"],
-		auth: typeof args.auth !== "undefined" ? args.auth : true,
+		folderUri: extra.length > 1 ? extra[extra.length - 1] : undefined,
+		host: args.host,
 		password: process.env.PASSWORD,
-		folderUri: args["_"] && args["_"].length > 1
-			? args["_"][args["_"].length - 1]
-			: undefined,
 	};
 
 	if (!options.host) {
-		options.host = !options.auth || options.allowHttp
-			? "localhost"
-			: "0.0.0.0";
+		options.host = !options.auth || options.allowHttp ? "localhost" : "0.0.0.0";
 	}
 
 	let usingGeneratedCert = false;
@@ -152,18 +143,16 @@ const main = async (): Promise<void> => {
 		usingGeneratedPassword = true;
 	}
 
-	const webviewPort = typeof args["webview-port"] !== "undefined"
-		&& parseInt(args["webview-port"], 10) || 8444;
+	const webviewPort = args["webview-port"];
 	const webviewServer = new WebviewServer({
 		...options,
-		port: webviewPort,
+		port: typeof webviewPort !== "undefined" && parseInt(webviewPort, 10) || 8444,
 		socket: args["webview-socket"],
 	});
 
-	const port = typeof args.port !== "undefined" && parseInt(args.port, 10) || 8443;
 	const server = new MainServer({
 		...options,
-		port,
+		port: typeof args.port !== "undefined" && parseInt(args.port, 10) || 8443,
 		socket: args.socket,
 	}, webviewServer, args);
 
@@ -196,7 +185,7 @@ const main = async (): Promise<void> => {
 
 	if (!args.socket && args.open) {
 		// The web socket doesn't seem to work if using 0.0.0.0.
-		const openAddress = `http://localhost:${port}`;
+		const openAddress = `http://localhost:${server.options.port}`;
 		await open(openAddress).catch(console.error);
 		console.log(`  - Opened ${openAddress}`);
 	}

src/connection.ts

@@ -6,7 +6,7 @@ import { Emitter } from "vs/base/common/event";
 import { ISocket } from "vs/base/parts/ipc/common/ipc.net";
 import { NodeSocket } from "vs/base/parts/ipc/node/ipc.net";
 import { ILogService } from "vs/platform/log/common/log";
-import { IExtHostReadyMessage, IExtHostSocketMessage } from "vs/workbench/services/extensions/common/extensionHostProtocol";
+import { IExtHostReadyMessage } from "vs/workbench/services/extensions/common/extensionHostProtocol";
 
 import { Protocol } from "vs/server/src/protocol";
 import { uriTransformerPath } from "vs/server/src/util";
@@ -15,17 +15,11 @@ export abstract class Connection {
 	protected readonly _onClose = new Emitter<void>();
 	public readonly onClose = this._onClose.event;
 	protected disposed: boolean = false;
-
 	public constructor(protected protocol: Protocol) {}
-
 	/**
 	 * Set up the connection on a new socket.
 	 */
 	public abstract reconnect(socket: ISocket, buffer: VSBuffer): void;
-
-	/**
-	 * Clean up the connection.
-	 */
 	protected abstract dispose(): void;
 }
 
@@ -62,16 +56,10 @@ export class ManagementConnection extends Connection {
 	}
 }
 
-/**
- * Manage the extension host process.
- */
 export class ExtensionHostConnection extends Connection {
 	private process: cp.ChildProcess;
 
-	public constructor(
-		protocol: Protocol, buffer: VSBuffer,
-		private readonly log: ILogService,
-	) {
+	public constructor(protocol: Protocol, buffer: VSBuffer, private readonly log: ILogService) {
 		super(protocol);
 		protocol.dispose();
 		this.process = this.spawn(buffer);
@@ -96,23 +84,17 @@ export class ExtensionHostConnection extends Connection {
 	private sendInitMessage(buffer: VSBuffer): void {
 		const socket = this.protocol.getUnderlyingSocket();
 		socket.pause();
-
-		const initMessage: IExtHostSocketMessage = {
+		this.process.send({
 			type: "VSCODE_EXTHOST_IPC_SOCKET",
 			initialDataChunk: (buffer.buffer as Buffer).toString("base64"),
 			skipWebSocketFrames: this.protocol.getSocket() instanceof NodeSocket,
-		};
-
-		this.process.send(initMessage, socket);
+		}, socket);
 	}
 
 	private spawn(buffer: VSBuffer): cp.ChildProcess {
 		const proc = cp.fork(
 			getPathFromAmdModule(require, "bootstrap-fork"),
-			[
-				"--type=extensionHost",
-				`--uriTransformerPath=${uriTransformerPath()}`
-			],
+			[ "--type=extensionHost", `--uriTransformerPath=${uriTransformerPath()}` ],
 			{
 				env: {
 					...process.env,
@@ -129,13 +111,8 @@ export class ExtensionHostConnection extends Connection {
 
 		proc.on("error", () => this.dispose());
 		proc.on("exit", () => this.dispose());
-
-		proc.stdout.setEncoding("utf8");
-		proc.stderr.setEncoding("utf8");
-
-		proc.stdout.on("data", (d) => this.log.info("Extension host stdout", d));
-		proc.stderr.on("data", (d) => this.log.error("Extension host stderr", d));
-
+		proc.stdout.setEncoding("utf8").on("data", (d) => this.log.info("Extension host stdout", d));
+		proc.stderr.setEncoding("utf8").on("data", (d) => this.log.error("Extension host stderr", d));
 		proc.on("message", (event) => {
 			if (event && event.type === "__$console") {
 				const severity = this.log[event.severity] ? event.severity : "info";
@@ -149,8 +126,7 @@ export class ExtensionHostConnection extends Connection {
 				this.sendInitMessage(buffer);
 			}
 		};
-		proc.on("message", listen);
 
-		return proc;
+		return proc.on("message", listen);
 	}
 }

src/protocol.ts

@@ -73,10 +73,7 @@ export class Protocol extends PersistentProtocol {
 	 * TODO: This ignores the authentication process entirely for now.
 	 */
 	private authenticate(_message: AuthRequest): void {
-		this.sendMessage({
-			type: "sign",
-			data: "",
-		});
+		this.sendMessage({ type: "sign", data: "" });
 	}
 
 	/**