From 7cfae38931132fb346daa631199912b54eae2769 Mon Sep 17 00:00:00 2001 From: Sandeep Somavarapu Date: Tue, 11 Jun 2019 11:21:47 +0200 Subject: [PATCH] use local hash instead of browser hash --- src/vs/workbench/browser/web.main.ts | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/src/vs/workbench/browser/web.main.ts b/src/vs/workbench/browser/web.main.ts index 5cc0b5ed05b..44771ae845a 100644 --- a/src/vs/workbench/browser/web.main.ts +++ b/src/vs/workbench/browser/web.main.ts @@ -30,6 +30,7 @@ import { WorkspaceService } from 'vs/workbench/services/configuration/browser/co import { ConfigurationCache } from 'vs/workbench/services/configuration/browser/configurationCache'; import { ConfigurationFileService } from 'vs/workbench/services/configuration/common/configuration'; import { WebResources } from 'vs/workbench/browser/web.resources'; +import { hash } from 'vs/base/common/hash'; interface IWindowConfiguration { settingsUri: URI; @@ -159,25 +160,16 @@ class CodeRendererMain extends Disposable { } } - private async resolveWorkspaceInitializationPayload(): Promise { - - const hash = (uri: URI) => { - return crypto.subtle.digest('SHA-1', new TextEncoder().encode(uri.toString())).then(buffer => { - // https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/digest#Converting_a_digest_to_a_hex_string - return Array.prototype.map.call(new Uint8Array(buffer), (value: number) => `00${value.toString(16)}`.slice(-2)).join(''); - }); - }; + private resolveWorkspaceInitializationPayload(): IWorkspaceInitializationPayload { // Multi-root workspace if (this.configuration.workspaceUri) { - const id = await hash(this.configuration.workspaceUri); - return { id, configPath: this.configuration.workspaceUri }; + return { id: hash(this.configuration.workspaceUri.toString()).toString(16), configPath: this.configuration.workspaceUri }; } // Single-folder workspace if (this.configuration.folderUri) { - const id = await hash(this.configuration.folderUri); - return { id, folder: this.configuration.folderUri }; + return { id: hash(this.configuration.folderUri.toString()).toString(16), folder: this.configuration.folderUri }; } return { id: 'empty-window' }; -- GitLab