danog/code-server
1
0
Fork 0
mirror of https://github.com/danog/code-server.git synced 2024-11-30 04:39:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: resolve conflict in extensionHostProcessSetup.ts

Browse Source 
From what I can tell, they added these `performance.mark` calls. Not sure
exactly what they do, but my guess is they're supposed to help with measuring
extension performance?
This commit is contained in:
Joe Previte 2021-02-25 11:42:42 -07:00
parent 7bf1fd979e
commit 262963c9ec
No known key found for this signature in database
GPG Key ID: 2C91590C6B742C24
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/vscode/src/vs/workbench/services/extensions/node/extensionHostProcessSetup.ts
View File

@ -313,12 +313,9 @@ function connectToRenderer(protocol: IMessagePassingProtocol): Promise<IRenderer
} }
export async function startExtensionHostProcess(): Promise<void> { export async function startExtensionHostProcess(): Promise<void> {
<<<<<<< HEAD
proxyAgent.monkeyPatch(true); proxyAgent.monkeyPatch(true);
=======
performance.mark(`code/extHost/willConnectToRenderer`); performance.mark(`code/extHost/willConnectToRenderer`);
>>>>>>> 89b6e0164fa770333755b11504e19a4232b1a2d4
const protocol = await createExtHostProtocol(); const protocol = await createExtHostProtocol();
performance.mark(`code/extHost/didConnectToRenderer`); performance.mark(`code/extHost/didConnectToRenderer`);
const renderer = await connectToRenderer(protocol); const renderer = await connectToRenderer(protocol);