bughz
/
code-server
mirror of https://github.com/coder/code-server.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: update web.main.ts 

Looks like they added two lines in the open method.
1. Logging for workbench configuration
2. Window - creating a BrowserWindow
This commit is contained in:
Joe Previte 2021-02-25 11:59:25 -07:00
parent ce1a8c89dd
commit 2bd9b6e1bf
No known key found for this signature in database
GPG Key ID: 2C91590C6B742C24
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/vscode/src/vs/workbench/browser/web.main.ts
View File

@ -39,12 +39,8 @@ import { BufferLogService } from 'vs/platform/log/common/bufferLog';
import { FileLogService } from 'vs/platform/log/common/fileLogService'; import { FileLogService } from 'vs/platform/log/common/fileLogService';
import { toLocalISOString } from 'vs/base/common/date'; import { toLocalISOString } from 'vs/base/common/date';
import { isWorkspaceToOpen, isFolderToOpen } from 'vs/platform/windows/common/windows'; import { isWorkspaceToOpen, isFolderToOpen } from 'vs/platform/windows/common/windows';
<<<<<<< HEAD
import { getWorkspaceIdentifier } from 'vs/workbench/services/workspaces/browser/workspaces';
import { initialize } from 'vs/server/browser/client'; import { initialize } from 'vs/server/browser/client';
=======
import { getSingleFolderWorkspaceIdentifier, getWorkspaceIdentifier } from 'vs/workbench/services/workspaces/browser/workspaces'; import { getSingleFolderWorkspaceIdentifier, getWorkspaceIdentifier } from 'vs/workbench/services/workspaces/browser/workspaces';
>>>>>>> 89b6e0164fa770333755b11504e19a4232b1a2d4
import { coalesce } from 'vs/base/common/arrays'; import { coalesce } from 'vs/base/common/arrays';
import { InMemoryFileSystemProvider } from 'vs/platform/files/common/inMemoryFilesystemProvider'; import { InMemoryFileSystemProvider } from 'vs/platform/files/common/inMemoryFilesystemProvider';
import { ICommandService } from 'vs/platform/commands/common/commands'; import { ICommandService } from 'vs/platform/commands/common/commands';
@ -98,15 +94,12 @@ class BrowserMain extends Disposable {
// Startup // Startup
const instantiationService = workbench.startup(); const instantiationService = workbench.startup();
<<<<<<< HEAD
await initialize(services.serviceCollection); await initialize(services.serviceCollection);
=======
// Window // Window
this._register(instantiationService.createInstance(BrowserWindow)); this._register(instantiationService.createInstance(BrowserWindow));
// Logging // Logging
services.logService.trace('workbench configuration', JSON.stringify(this.configuration)); services.logService.trace('workbench configuration', JSON.stringify(this.configuration));
>>>>>>> 89b6e0164fa770333755b11504e19a4232b1a2d4
// Return API Facade // Return API Facade
return instantiationService.invokeFunction(accessor => { return instantiationService.invokeFunction(accessor => {