TheLanc3/code-server
1
0
Fork 0
mirror of https://github.com/coder/code-server.git synced 2026-05-06 20:41:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

chore(vscode): update to 1.53.2

Browse Source 
These conflicts will be resolved in the following commits. We do it this way so
that PR review is possible.
This commit is contained in:
Joe Previte
2021-02-25 11:27:27 -07:00
parent db3a13ba06 89b6e0164f
commit eae5d8c807
1900 changed files with 83066 additions and 64589 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/vscode/src/vs/platform/webview/common/resourceLoader.ts
View File

@@ -9,6 +9,7 @@ import { isUNC } from 'vs/base/common/extpath';
import { Schemas } from 'vs/base/common/network';
import { sep } from 'vs/base/common/path';
import { URI } from 'vs/base/common/uri';
import { ILogService } from 'vs/platform/log/common/log';
import { IRemoteConnectionData } from 'vs/platform/remote/common/remoteAuthorityResolver';
import { IRequestService } from 'vs/platform/request/common/request';
import { getWebviewContentMimeType } from 'vs/platform/webview/common/mimeTypes';
@@ -24,7 +25,8 @@ export namespace WebviewResourceResponse {
constructor(
public readonly stream: VSBufferReadableStream,
public readonly mimeType: string
public readonly etag: string | undefined,
public readonly mimeType: string,
) { }
}
@@ -35,7 +37,7 @@ export namespace WebviewResourceResponse {
}
interface FileReader {
readFileStream(resource: URI): Promise<VSBufferReadableStream>;
readFileStream(resource: URI): Promise<{ stream: VSBufferReadableStream, etag?: string }>;
}
export async function loadLocalResource(
@@ -48,8 +50,14 @@ export async function loadLocalResource(
},
fileReader: FileReader,
requestService: IRequestService,
logService: ILogService,
): Promise<WebviewResourceResponse.StreamResponse> {
logService.debug(`loadLocalResource - being. requestUri=${requestUri}`);
let resourceToLoad = getResourceToLoad(requestUri, options.roots);
logService.debug(`loadLocalResource - found resource to load. requestUri=${requestUri}, resourceToLoad=${resourceToLoad}`);
if (!resourceToLoad) {
return WebviewResourceResponse.AccessDenied;
}
@@ -63,17 +71,23 @@ export async function loadLocalResource(
if (resourceToLoad.scheme === Schemas.http || resourceToLoad.scheme === Schemas.https) {
const response = await requestService.request({ url: resourceToLoad.toString(true) }, CancellationToken.None);
logService.debug(`loadLocalResource - Loaded over http(s). requestUri=${requestUri}, response=${response.res.statusCode}`);
if (response.res.statusCode === 200) {
return new WebviewResourceResponse.StreamSuccess(response.stream, mime);
return new WebviewResourceResponse.StreamSuccess(response.stream, undefined, mime);
}
return WebviewResourceResponse.Failed;
}
try {
const contents = await fileReader.readFileStream(resourceToLoad);
return new WebviewResourceResponse.StreamSuccess(contents, mime);
logService.debug(`loadLocalResource - Loaded using fileReader. requestUri=${requestUri}`);
return new WebviewResourceResponse.StreamSuccess(contents.stream, contents.etag, mime);
} catch (err) {
logService.debug(`loadLocalResource - Error using fileReader. requestUri=${requestUri}`);
console.log(err);
return WebviewResourceResponse.Failed;
}
}

10
lib/vscode/src/vs/platform/webview/common/webviewPortMapping.ts
View File

@@ -19,7 +19,7 @@ export interface IWebviewPortMapping {
*/
export class WebviewPortMappingManager implements IDisposable {
private readonly _tunnels = new Map<number, Promise<RemoteTunnel>>();
private readonly _tunnels = new Map<number, RemoteTunnel>();
constructor(
private readonly _getExtensionLocation: () => URI | undefined,
@@ -60,19 +60,19 @@ export class WebviewPortMappingManager implements IDisposable {
return undefined;
}
dispose() {
async dispose() {
for (const tunnel of this._tunnels.values()) {
tunnel.then(tunnel => tunnel.dispose());
await tunnel.dispose();
}
this._tunnels.clear();
}
private getOrCreateTunnel(remoteAuthority: IAddress, remotePort: number): Promise<RemoteTunnel> | undefined {
private async getOrCreateTunnel(remoteAuthority: IAddress, remotePort: number): Promise<RemoteTunnel | undefined> {
const existing = this._tunnels.get(remotePort);
if (existing) {
return existing;
}
const tunnel = this.tunnelService.openTunnel({ getAddress: async () => remoteAuthority }, undefined, remotePort);
const tunnel = await this.tunnelService.openTunnel({ getAddress: async () => remoteAuthority }, undefined, remotePort);
if (tunnel) {
this._tunnels.set(remotePort, tunnel);
}