Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-25 11:08:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into term

Browse Source
This commit is contained in:
Daniel Imms
2022-06-20 15:06:36 -07:00
committed by GitHub
parent 1f37af91f0 2d4988b53b
commit b2b0adb6ad
526 changed files with 9732 additions and 6372 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/vs/server/node/extensionHostConnection.ts
View File

@@ -22,6 +22,7 @@ import { logRemoteEntry } from 'vs/workbench/services/extensions/common/remoteCo
import { removeDangerousEnvVariables } from 'vs/base/common/processes';
import { IExtensionHostStatusService } from 'vs/server/node/extensionHostStatusService';
import { DisposableStore, toDisposable } from 'vs/base/common/lifecycle';
import { IPCExtHostConnection, writeExtHostConnection, SocketExtHostConnection } from 'vs/workbench/services/extensions/common/extensionHostEnv';
export async function buildUserEnvironment(startParamsEnv: { [key: string]: string | null } = {}, withUserShellEnvironment: boolean, language: string, isDebug: boolean, environmentService: IServerEnvironmentService, logService: ILogService): Promise<IProcessEnvironment> {
const nlsConfig = await getNLSConfiguration(language, environmentService.userDataPath);
@@ -244,11 +245,11 @@ export class ExtensionHostConnection {
let extHostNamedPipeServer: net.Server | null;
if (this._canSendSocket) {
env['VSCODE_EXTHOST_WILL_SEND_SOCKET'] = 'true';
writeExtHostConnection(new SocketExtHostConnection(), env);
extHostNamedPipeServer = null;
} else {
const { namedPipeServer, pipeName } = await this._listenOnPipe();
env['VSCODE_IPC_HOOK_EXTHOST'] = pipeName;
writeExtHostConnection(new IPCExtHostConnection(pipeName), env);
extHostNamedPipeServer = namedPipeServer;
}
@@ -326,9 +327,7 @@ export class ExtensionHostConnection {
const namedPipeServer = net.createServer();
namedPipeServer.on('error', reject);
namedPipeServer.listen(pipeName, () => {
if (namedPipeServer) {
namedPipeServer.removeListener('error', reject);
}
namedPipeServer?.removeListener('error', reject);
resolve({ pipeName, namedPipeServer });
});
});

2
src/vs/server/node/remoteExtensionHostAgentCli.ts
View File

@@ -94,7 +94,7 @@ class CliMain extends Disposable {
fileService.registerProvider(Schemas.file, this._register(new DiskFileSystemProvider(logService)));
// User Data Profiles
const userDataProfilesService = this._register(new UserDataProfilesService(undefined, undefined, environmentService, fileService, logService));
const userDataProfilesService = this._register(new UserDataProfilesService(undefined, environmentService, fileService, logService));
services.set(IUserDataProfilesService, userDataProfilesService);
// Configuration

2
src/vs/server/node/serverServices.ts
View File

@@ -111,7 +111,7 @@ export async function setupServerServices(connectionToken: ServerConnectionToken
fileService.registerProvider(Schemas.file, disposables.add(new DiskFileSystemProvider(logService)));
// Configuration
const userDataProfilesService = new UserDataProfilesService(undefined, undefined, environmentService, fileService, logService);
const userDataProfilesService = new UserDataProfilesService(undefined, environmentService, fileService, logService);
const configurationService = new ConfigurationService(environmentService.machineSettingsResource, fileService, new NullPolicyService(), logService);
services.set(IConfigurationService, configurationService);
await configurationService.initialize();