mirror of
https://github.com/coder/code-server.git
synced 2026-05-05 12:05:18 +02:00
chore(vscode): update to 1.56.0
This commit is contained in:
@@ -61,6 +61,9 @@ import { IUriIdentityService } from 'vs/workbench/services/uriIdentity/common/ur
|
||||
import { UriIdentityService } from 'vs/workbench/services/uriIdentity/common/uriIdentityService';
|
||||
import { BrowserWindow } from 'vs/workbench/browser/window';
|
||||
import { ITimerService } from 'vs/workbench/services/timer/browser/timerService';
|
||||
import { WorkspaceTrustManagementService } from 'vs/workbench/services/workspaces/common/workspaceTrust';
|
||||
import { IWorkspaceTrustManagementService } from 'vs/platform/workspace/common/workspaceTrust';
|
||||
import { HTMLFileSystemProvider } from 'vs/platform/files/browser/htmlFileSystemProvider';
|
||||
|
||||
class BrowserMain extends Disposable {
|
||||
|
||||
@@ -80,10 +83,9 @@ class BrowserMain extends Disposable {
|
||||
}
|
||||
|
||||
async open(): Promise<IWorkbench> {
|
||||
const services = await this.initServices();
|
||||
|
||||
await domContentLoaded();
|
||||
mark('code/willStartWorkbench');
|
||||
// Init services and wait for DOM to be ready in parallel
|
||||
const [services] = await Promise.all([this.initServices(), domContentLoaded()]);
|
||||
|
||||
// Create Workbench
|
||||
const workbench = new Workbench(this.domElement, services.serviceCollection, services.logService);
|
||||
@@ -132,7 +134,7 @@ class BrowserMain extends Disposable {
|
||||
}
|
||||
}));
|
||||
this._register(workbench.onWillShutdown(() => storageService.close()));
|
||||
this._register(workbench.onShutdown(() => this.dispose()));
|
||||
this._register(workbench.onDidShutdown(() => this.dispose()));
|
||||
}
|
||||
|
||||
private async initServices(): Promise<{ serviceCollection: ServiceCollection, configurationService: IWorkbenchConfigurationService, logService: ILogService, storageService: BrowserStorageService }> {
|
||||
@@ -202,6 +204,14 @@ class BrowserMain extends Disposable {
|
||||
})
|
||||
]);
|
||||
|
||||
// Workspace Trust Service
|
||||
const workspaceTrustManagementService = new WorkspaceTrustManagementService(configurationService, environmentService, storageService, uriIdentityService, configurationService);
|
||||
serviceCollection.set(IWorkspaceTrustManagementService, workspaceTrustManagementService);
|
||||
|
||||
// Update workspace trust so that configuration is updated accordingly
|
||||
configurationService.updateWorkspaceTrust(workspaceTrustManagementService.isWorkpaceTrusted());
|
||||
this._register(workspaceTrustManagementService.onDidChangeTrust(() => configurationService.updateWorkspaceTrust(workspaceTrustManagementService.isWorkpaceTrusted())));
|
||||
|
||||
// Request Service
|
||||
const requestService = new BrowserRequestService(remoteAgentService, configurationService, logService);
|
||||
serviceCollection.set(IRequestService, requestService);
|
||||
@@ -271,7 +281,16 @@ class BrowserMain extends Disposable {
|
||||
} catch (error) {
|
||||
onUnexpectedError(error);
|
||||
}
|
||||
fileService.registerProvider(Schemas.userData, indexedDBUserDataProvider || new InMemoryFileSystemProvider());
|
||||
|
||||
let userDataProvider: IFileSystemProvider | undefined;
|
||||
if (indexedDBUserDataProvider) {
|
||||
userDataProvider = indexedDBUserDataProvider;
|
||||
} else {
|
||||
logService.info('using in-memory user data provider');
|
||||
userDataProvider = new InMemoryFileSystemProvider();
|
||||
}
|
||||
|
||||
fileService.registerProvider(Schemas.userData, userDataProvider);
|
||||
|
||||
if (indexedDBUserDataProvider) {
|
||||
registerAction2(class ResetUserDataAction extends Action2 {
|
||||
@@ -301,6 +320,9 @@ class BrowserMain extends Disposable {
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
fileService.registerProvider(Schemas.file, new HTMLFileSystemProvider());
|
||||
fileService.registerProvider(Schemas.tmp, new InMemoryFileSystemProvider());
|
||||
}
|
||||
|
||||
private async createStorageService(payload: IWorkspaceInitializationPayload, environmentService: IWorkbenchEnvironmentService, fileService: IFileService, logService: ILogService): Promise<BrowserStorageService> {
|
||||
|
||||
Reference in New Issue
Block a user