opensource/code-server
1
0
Fork 0
mirror of https://github.com/coder/code-server.git synced 2025-07-28 20:43:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2773 from cdr/upgrade-vscode-1.53

Browse Source 
feat(vscode): update to version 1.53.2
This commit is contained in:
Joe Previte
2021-03-05 14:03:10 -07:00
committed by GitHub
parent 5f42112269 e47eabf375
commit 925073db31
1916 changed files with 84281 additions and 66671 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/vscode/src/vs/server/node/server.ts
View File

@ -1,4 +1,5 @@
import { field } from '@coder/logger';
import { release } from 'os';
import * as fs from 'fs';
import * as net from 'net';
import * as path from 'path';
@ -44,7 +45,7 @@ import { TelemetryLogAppender } from 'vs/platform/telemetry/common/telemetryLogA
import { TelemetryService } from 'vs/platform/telemetry/common/telemetryService';
import { combinedAppender, NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils';
import { AppInsightsAppender } from 'vs/platform/telemetry/node/appInsightsAppender';
import { resolveCommonProperties } from 'vs/platform/telemetry/node/commonProperties';
import { resolveCommonProperties } from 'vs/platform/telemetry/common/commonProperties';
import { TelemetryChannel } from 'vs/server/common/telemetry';
import { Query, VscodeOptions, WorkbenchOptions } from 'vs/server/ipc';
import { ExtensionEnvironmentChannel, FileProviderChannel, TerminalProviderChannel } from 'vs/server/node/channel';
@ -119,7 +120,7 @@ export class Vscode {
};
}
public async handleWebSocket(socket: net.Socket, query: Query): Promise<true> {
public async handleWebSocket(socket: net.Socket, query: Query, _permessageDeflate: boolean): Promise<true> {
if (!query.reconnectionToken) {
throw new Error('Reconnection token is missing from query parameters');
}
@ -127,6 +128,7 @@ export class Vscode {
reconnectionToken: <string>query.reconnectionToken,
reconnection: query.reconnection === 'true',
skipWebSocketFrames: query.skipWebSocketFrames === 'true',
// TODO: permessageDeflate,
});
try {
await this.connect(await protocol.handshake(), protocol);
@ -259,7 +261,7 @@ export class Vscode {
),
sendErrorTelemetry: true,
commonProperties: resolveCommonProperties(
product.commit, product.version, machineId,
fileService, release(), process.arch, product.commit, product.version, machineId,
[], environmentService.installSourcePath, 'code-server',
),
piiPaths,