Update VS Code to 1.41.0

code-asher · code-asher · commit e6d1f2a7c8a1 · 2019-12-16T16:52:29.000-06:00
diff --git a/.travis.yml b/.travis.yml
@@ -6,7 +6,7 @@ services:
 
 before_install:
   - export MAJOR_VERSION="2"
-  - export VSCODE_VERSION="1.39.2"
+  - export VSCODE_VERSION="1.41.0"
   - export VERSION="$MAJOR_VERSION.$TRAVIS_BUILD_NUMBER"
   - export TAG="$VERSION-vsc$VSCODE_VERSION"
   - if [[ "$TRAVIS_BRANCH" == "master" ]]; then export MINIFY="true"; fi
diff --git a/README.md b/README.md
@@ -174,8 +174,6 @@ Our changes include:
 - Modify the loader, websocket, webview, service worker, and asset requests to
   use the URL of the page as a base (and TLS if necessary for the websocket).
 - Send client-side telemetry through the server.
-- Add an upload service along with a file prefix to ignore for temporary files
-  created during upload.
 - Make changing the display language work.
 - Make it possible for us to load code on the client.
 - Make extensions work in the browser.
diff --git a/scripts/build.ts b/scripts/build.ts
@@ -339,26 +339,6 @@ class Builder {
 			]);
 		});
 
-		// onigasm 2.2.2 has a bug that makes it broken for PHP files so use 2.2.1.
-		// https://github.com/NeekSandhu/onigasm/issues/17
-		await this.task("Applying onigasm PHP fix", async () => {
-			const onigasmPath = path.join(finalBuildPath, "node_modules/onigasm-umd");
-			const onigasmTmpPath = `${onigasmPath}-temp`;
-			await Promise.all([
-				fs.remove(onigasmPath),
-				fs.mkdir(onigasmTmpPath),
-			]);
-			await util.promisify(cp.exec)(`git clone "https://github.com/alexandrudima/onigasm-umd" "${onigasmPath}"`);
-			await util.promisify(cp.exec)("yarn", { cwd: onigasmPath });
-			await util.promisify(cp.exec)("yarn add --dev onigasm@2.2.1", { cwd: onigasmPath });
-			await util.promisify(cp.exec)("yarn package", { cwd: onigasmPath });
-			await Promise.all(["release", "LICENSE", "package.json"].map((fileName) => {
-				return fs.copy(path.join(onigasmPath, fileName), path.join(onigasmTmpPath, fileName));
-			}));
-			await fs.remove(onigasmPath);
-			await fs.move(onigasmTmpPath, onigasmPath);
-		});
-
 		this.log(`Final build: ${finalBuildPath}`);
 	}
 
diff --git a/scripts/vscode.patch b/scripts/vscode.patch
diff --git a/src/browser/api.ts b/src/browser/api.ts
@@ -21,7 +21,7 @@ import { ITelemetryService } from "vs/platform/telemetry/common/telemetry";
 import { IThemeService } from "vs/platform/theme/common/themeService";
 import { IWorkspaceContextService } from "vs/platform/workspace/common/workspace";
 import * as extHostTypes from "vs/workbench/api/common/extHostTypes";
-import { CustomTreeView, CustomTreeViewPanel } from "vs/workbench/browser/parts/views/customView";
+import { CustomTreeView, CustomTreeViewPane } from "vs/workbench/browser/parts/views/customView";
 import { ViewContainerViewlet } from "vs/workbench/browser/parts/views/viewsViewlet";
 import { Extensions as ViewletExtensions, ShowViewletAction, ViewletDescriptor, ViewletRegistry } from "vs/workbench/browser/viewlet";
 import { Extensions as ActionExtensions, IWorkbenchActionRegistry } from "vs/workbench/common/actions";
@@ -120,11 +120,11 @@ export const coderApi = (serviceCollection: ServiceCollection): CoderApi => {
 			}
 
 			Registry.as<ViewletRegistry>(ViewletExtensions.Viewlets).registerViewlet(
-				new ViewletDescriptor(CustomViewlet as any, id, containerName, cssClass, undefined, URI.parse(icon)),
+				ViewletDescriptor.create(CustomViewlet as any, id, containerName, cssClass, undefined, URI.parse(icon)),
 			);
 
 			Registry.as<IWorkbenchActionRegistry>(ActionExtensions.WorkbenchActions).registerWorkbenchAction(
-				new SyncActionDescriptor(OpenCustomViewletAction as any, id, localize("showViewlet", "Show {0}", containerName)),
+				SyncActionDescriptor.create(OpenCustomViewletAction as any, id, localize("showViewlet", "Show {0}", containerName)),
 				"View: Show {0}",
 				localize("view", "View"),
 			);
@@ -137,7 +137,7 @@ export const coderApi = (serviceCollection: ServiceCollection): CoderApi => {
 			Registry.as<IViewsRegistry>(ViewsExtensions.ViewsRegistry).registerViews([{
 				id: viewId,
 				name: viewName,
-				ctorDescriptor: { ctor: CustomTreeViewPanel },
+				ctorDescriptor: { ctor: CustomTreeViewPane },
 				treeView: getService(IInstantiationService).createInstance(CustomTreeView as any, viewId, container),
 			}] as ITreeViewDescriptor[], container);
 		},
@@ -286,8 +286,8 @@ class StatusBarEntry implements vscode.StatusBarItem {
 
 	private _id: number;
 	private entry: IStatusBarEntry;
-	private visible: boolean;
-	private disposed: boolean;
+	private visible?: boolean;
+	private disposed?: boolean;
 	private statusId: string;
 	private statusName: string;
 	private accessor?: IStatusbarEntryAccessor;
diff --git a/src/browser/extHostNodeProxy.ts b/src/browser/extHostNodeProxy.ts
@@ -1,5 +1,5 @@
 import { Emitter } from "vs/base/common/event";
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { createDecorator } from "vs/platform/instantiation/common/instantiation";
 import { ExtHostNodeProxyShape, MainContext, MainThreadNodeProxyShape } from "vs/workbench/api/common/extHost.protocol";
 import { IExtHostRpcService } from "vs/workbench/api/common/extHostRpcService";
 
@@ -43,4 +43,4 @@ export class ExtHostNodeProxy implements ExtHostNodeProxyShape {
 }
 
 export interface IExtHostNodeProxy extends ExtHostNodeProxy { }
-export const IExtHostNodeProxy = createDecorator<IExtHostNodeProxy>('IExtHostNodeProxy');
+export const IExtHostNodeProxy = createDecorator<IExtHostNodeProxy>("IExtHostNodeProxy");
diff --git a/src/browser/login.html b/src/browser/login.html
@@ -4,9 +4,10 @@
 		<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no">
 		<meta http-equiv="Content-Security-Policy" content="default-src 'none'; style-src 'self' 'unsafe-inline'; script-src 'unsafe-inline'; manifest-src 'self'; img-src 'self';">
 		<title>Authenticate: code-server</title>
-		<link rel="icon" href="./favicon.ico" type="image/x-icon" />
-		<link rel="manifest" href="./manifest.json">
+		<link rel="icon" href="./static/out/vs/server/src/media/favicon.ico" type="image/x-icon" />
+		<link rel="manifest" href="./static/out/vs/server/src/media/manifest.json" crossorigin="use-credentials">
 		<link rel="apple-touch-icon" href="./static/out/vs/server/src/media/code-server.png" />
+		<meta name="apple-mobile-web-app-capable" content="yes">
 		<link href="./static/out/vs/server/src/media/login.css" rel="stylesheet">
 	</head>
 	<body>
diff --git a/src/browser/workbench-build.html b/src/browser/workbench-build.html
@@ -7,23 +7,6 @@
 		<!-- Disable pinch zooming -->
 		<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no">
 
-		<!-- Content Security Policy -->
-		<meta
-			http-equiv="Content-Security-Policy"
-			content="
-				default-src 'self';
-				img-src 'self' https: data: blob:;
-				media-src 'none';
-				script-src 'self' 'unsafe-eval' https: 'sha256-bpJydy1E+3Mx9MyBtkOIA3yyzM2wdyIz115+Sgq21+0=' 'sha256-meDZW3XhN5JmdjFUrWGhTouRKBiWYtXHltaKnqn/WMo=';
-				child-src 'self';
-				frame-src 'self';
-				worker-src 'self';
-				style-src 'self' 'unsafe-inline';
-				connect-src 'self' ws: wss: https:;
-				font-src 'self' blob:;
-				manifest-src 'self';
-		">
-
 		<!-- Workbench Configuration -->
 		<meta id="vscode-workbench-web-configuration" data-settings="{{WORKBENCH_WEB_CONFIGURATION}}">
 
@@ -36,15 +19,14 @@
 		<meta id="vscode-remote-nls-configuration" data-settings="{{NLS_CONFIGURATION}}">
 
 		<!-- Workbench Icon/Manifest/CSS -->
-		<link rel="icon" href="./favicon.ico" type="image/x-icon" />
-		<link rel="manifest" href="./manifest.json" crossorigin="use-credentials">
-		<link rel="apple-touch-icon" href="./static-{{COMMIT}}/out/vs/server/src/media/code-server.png" />
+		<link rel="icon" href="./static-{{COMMIT}}/out/vs/server/src/media/favicon.ico" type="image/x-icon" />
+		<link rel="manifest" href="./static-{{COMMIT}}/out/vs/server/src/media/manifest.json" crossorigin="use-credentials">
 		<link data-name="vs/workbench/workbench.web.api" rel="stylesheet" href="./static-{{COMMIT}}/out/vs/workbench/workbench.web.api.css">
+		<link rel="apple-touch-icon" href="./static-{{COMMIT}}/out/vs/server/src/media/code-server.png" />
 		<meta name="apple-mobile-web-app-capable" content="yes">
 
 		<!-- Prefetch to avoid waterfall -->
 		<link rel="prefetch" href="./static-{{COMMIT}}/node_modules/semver-umd/lib/semver-umd.js">
-		<link rel="prefetch" href="./static-{{COMMIT}}/node_modules/@microsoft/applicationinsights-web/dist/applicationinsights-web.js">
 	</head>
 
 	<body aria-label="">
@@ -90,8 +72,8 @@
 				'xterm': `${staticBase}/node_modules/xterm/lib/xterm.js`,
 				'xterm-addon-search': `${staticBase}/node_modules/xterm-addon-search/lib/xterm-addon-search.js`,
 				'xterm-addon-web-links': `${staticBase}/node_modules/xterm-addon-web-links/lib/xterm-addon-web-links.js`,
+				'xterm-addon-webgl': `${staticBase}/node_modules/xterm-addon-webgl/lib/xterm-addon-webgl.js`,
 				'semver-umd': `${staticBase}/node_modules/semver-umd/lib/semver-umd.js`,
-				'@microsoft/applicationinsights-web': `${staticBase}/node_modules/@microsoft/applicationinsights-web/dist/applicationinsights-web.js`,
 			},
 			'vs/nls': nlsConfig,
 		};
diff --git a/src/browser/workbench.html b/src/browser/workbench.html
@@ -7,23 +7,6 @@
 		<!-- Disable pinch zooming -->
 		<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no">
 
-		<!-- Content Security Policy -->
-		<meta
-			http-equiv="Content-Security-Policy"
-			content="
-				default-src 'self';
-				img-src 'self' https: data: blob:;
-				media-src 'none';
-				script-src 'self' https://az416426.vo.msecnd.net 'unsafe-eval' https: 'unsafe-inline';
-				child-src 'self';
-				frame-src 'self' https://*.vscode-webview-test.com;
-				worker-src 'self';
-				style-src 'self' 'unsafe-inline';
-				connect-src 'self' ws: wss: https:;
-				font-src 'self' blob:;
-				manifest-src 'self';
-		">
-
 		<!-- Workbench Configuration -->
 		<meta id="vscode-workbench-web-configuration" data-settings="{{WORKBENCH_WEB_CONFIGURATION}}">
 
@@ -36,8 +19,8 @@
 		<meta id="vscode-remote-nls-configuration" data-settings="{{NLS_CONFIGURATION}}">
 
 		<!-- Workbench Icon/Manifest/CSS -->
-		<link rel="icon" href="./favicon.ico" type="image/x-icon" />
-		<link rel="manifest" href="./manifest.json" crossorigin="use-credentials">
+		<link rel="icon" href="./static/out/vs/server/src/media/favicon.ico" type="image/x-icon" />
+		<link rel="manifest" href="./static/out/vs/server/src/media/manifest.json" crossorigin="use-credentials">
 	</head>
 
 	<body aria-label="">
@@ -58,8 +41,8 @@
 				'xterm': `${staticBase}/node_modules/xterm/lib/xterm.js`,
 				'xterm-addon-search': `${staticBase}/node_modules/xterm-addon-search/lib/xterm-addon-search.js`,
 				'xterm-addon-web-links': `${staticBase}/node_modules/xterm-addon-web-links/lib/xterm-addon-web-links.js`,
+				'xterm-addon-webgl': `${staticBase}/node_modules/xterm-addon-webgl/lib/xterm-addon-webgl.js`,
 				'semver-umd': `${staticBase}/node_modules/semver-umd/lib/semver-umd.js`,
-				'@microsoft/applicationinsights-web': `${staticBase}/node_modules/@microsoft/applicationinsights-web/dist/applicationinsights-web.js`,
 			},
 		};
 	</script>
diff --git a/src/media/manifest.json b/src/media/manifest.json
@@ -6,7 +6,7 @@
 	"background-color": "#fff",
 	"description": "Run VS Code on a remote server.",
 	"icons": [{
-		"src": "./static/out/vs/server/src/media/code-server.png",
+		"src": "./code-server.png",
 		"sizes": "384x384",
 		"type": "image/png"
 	}]
diff --git a/src/node/channel.ts b/src/node/channel.ts
@@ -1,23 +1,26 @@
 import * as path from "path";
-import { VSBuffer } from "vs/base/common/buffer";
+import { VSBuffer, VSBufferReadableStream } from "vs/base/common/buffer";
 import { Emitter, Event } from "vs/base/common/event";
 import { IDisposable } from "vs/base/common/lifecycle";
 import { OS } from "vs/base/common/platform";
+import { ReadableStreamEventPayload } from "vs/base/common/stream";
 import { URI, UriComponents } from "vs/base/common/uri";
 import { transformOutgoingURIs } from "vs/base/common/uriIpc";
 import { IServerChannel } from "vs/base/parts/ipc/common/ipc";
 import { IDiagnosticInfo } from "vs/platform/diagnostics/common/diagnostics";
 import { IEnvironmentService } from "vs/platform/environment/common/environment";
 import { ExtensionIdentifier, IExtensionDescription } from "vs/platform/extensions/common/extensions";
-import { FileDeleteOptions, FileOpenOptions, FileOverwriteOptions, FileType, IStat, IWatchOptions } from "vs/platform/files/common/files";
+import { FileDeleteOptions, FileOpenOptions, FileOverwriteOptions, FileReadStreamOptions, FileType, FileWriteOptions, IStat, IWatchOptions } from "vs/platform/files/common/files";
+import { createReadStream } from "vs/platform/files/common/io";
 import { DiskFileSystemProvider } from "vs/platform/files/node/diskFileSystemProvider";
 import { ILogService } from "vs/platform/log/common/log";
 import product from "vs/platform/product/common/product";
-import { IRemoteAgentEnvironment } from "vs/platform/remote/common/remoteAgentEnvironment";
+import { IRemoteAgentEnvironment, RemoteAgentConnectionContext } from "vs/platform/remote/common/remoteAgentEnvironment";
 import { ITelemetryService } from "vs/platform/telemetry/common/telemetry";
 import { INodeProxyService } from "vs/server/src/common/nodeProxy";
 import { getTranslations } from "vs/server/src/node/nls";
 import { getUriTransformer, localRequire } from "vs/server/src/node/util";
+import { IFileChangeDto } from "vs/workbench/api/common/extHost.protocol";
 import { ExtensionScanner, ExtensionScannerInput } from "vs/workbench/services/extensions/node/extensionPoints";
 
 /**
@@ -42,7 +45,7 @@ class Watcher extends DiskFileSystemProvider {
 	}
 }
 
-export class FileProviderChannel implements IServerChannel, IDisposable {
+export class FileProviderChannel implements IServerChannel<RemoteAgentConnectionContext>, IDisposable {
 	private readonly provider: DiskFileSystemProvider;
 	private readonly watchers = new Map<string, Watcher>();
 
@@ -53,48 +56,67 @@ export class FileProviderChannel implements IServerChannel, IDisposable {
 		this.provider = new DiskFileSystemProvider(this.logService);
 	}
 
-	public listen(context: any, event: string, args?: any): Event<any> {
+	public listen(context: RemoteAgentConnectionContext, event: string, args?: any): Event<any> {
 		switch (event) {
-			// This is where the actual file changes are sent. The watch method just
-			// adds things that will fire here. That means we have to split up
-			// watchers based on the session otherwise sessions would get events for
-			// other sessions. There is also no point in having the watcher unless
-			// something is listening. I'm not sure there is a different way to
-			// dispose, anyway.
-			case "filechange":
-				const session = args[0];
-				const emitter = new Emitter({
-					onFirstListenerAdd: () => {
-						const provider = new Watcher(this.logService);
-						this.watchers.set(session, provider);
-						const transformer = getUriTransformer(context.remoteAuthority);
-						provider.onDidChangeFile((events) => {
-							emitter.fire(events.map((event) => ({
-								...event,
-								resource: transformer.transformOutgoing(event.resource),
-							})));
-						});
-						provider.onDidErrorOccur((event) => emitter.fire(event));
-					},
-					onLastListenerRemove: () => {
-						this.watchers.get(session)!.dispose();
-						this.watchers.delete(session);
-					},
-				});
-
-				return emitter.event;
+			case "filechange": return this.filechange(context, args[0]);
+			case "readFileStream": return this.readFileStream(args[0], args[1]);
 		}
 
 		throw new Error(`Invalid listen "${event}"`);
 	}
 
+	private filechange(context: RemoteAgentConnectionContext, session: string): Event<IFileChangeDto[]> {
+		const emitter = new Emitter<IFileChangeDto[]>({
+			onFirstListenerAdd: () => {
+				const provider = new Watcher(this.logService);
+				this.watchers.set(session, provider);
+				const transformer = getUriTransformer(context.remoteAuthority);
+				provider.onDidChangeFile((events) => {
+					emitter.fire(events.map((event) => ({
+						...event,
+						resource: transformer.transformOutgoing(event.resource),
+					})));
+				});
+				provider.onDidErrorOccur((event) => this.logService.error(event));
+			},
+			onLastListenerRemove: () => {
+				this.watchers.get(session)!.dispose();
+				this.watchers.delete(session);
+			},
+		});
+
+		return emitter.event;
+	}
+
+	private readFileStream(resource: UriComponents, opts: FileReadStreamOptions): Event<ReadableStreamEventPayload<VSBuffer>> {
+		let fileStream: VSBufferReadableStream | undefined;
+		const emitter = new Emitter<ReadableStreamEventPayload<VSBuffer>>({
+			onFirstListenerAdd: () => {
+				if (!fileStream) {
+					fileStream = createReadStream(this.provider, this.transform(resource), {
+						...opts,
+						bufferSize: 64 * 1024, // From DiskFileSystemProvider
+					});
+					fileStream.on("data", (data) => emitter.fire(data));
+					fileStream.on("error", (error) => emitter.fire(error));
+					fileStream.on("end", () => emitter.fire("end"));
+				}
+			},
+			onLastListenerRemove: () => fileStream && fileStream.destroy(),
+		});
+
+		return emitter.event;
+	}
+
 	public call(_: unknown, command: string, args?: any): Promise<any> {
 		switch (command) {
 			case "stat": return this.stat(args[0]);
 			case "open": return this.open(args[0], args[1]);
 			case "close": return this.close(args[0]);
 			case "read": return this.read(args[0], args[1], args[2]);
+			case "readFile": return this.readFile(args[0]);
 			case "write": return this.write(args[0], args[1], args[2], args[3], args[4]);
+			case "writeFile": return this.writeFile(args[0], args[1], args[2]);
 			case "delete": return this.delete(args[0], args[1]);
 			case "mkdir": return this.mkdir(args[0]);
 			case "readdir": return this.readdir(args[0]);
@@ -130,10 +152,18 @@ export class FileProviderChannel implements IServerChannel, IDisposable {
 		return [buffer, bytesRead];
 	}
 
+	private async readFile(resource: UriComponents): Promise<VSBuffer> {
+		return VSBuffer.wrap(await this.provider.readFile(this.transform(resource)));
+	}
+
 	private write(fd: number, pos: number, buffer: VSBuffer, offset: number, length: number): Promise<number> {
 		return this.provider.write(fd, pos, buffer.buffer, offset, length);
 	}
 
+	private writeFile(resource: UriComponents, buffer: VSBuffer, opts: FileWriteOptions): Promise<void> {
+		return this.provider.writeFile(this.transform(resource), buffer.buffer, opts);
+	}
+
 	private async delete(resource: UriComponents, opts: FileDeleteOptions): Promise<void> {
 		return this.provider.delete(this.transform(resource), opts);
 	}
diff --git a/src/node/insights.ts b/src/node/insights.ts
diff --git a/src/node/marketplace.ts b/src/node/marketplace.ts
diff --git a/src/node/server.ts b/src/node/server.ts
diff --git a/src/node/update.ts b/src/node/update.ts
