Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-27 03:54:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Have .get return promise directly

Browse Source
This commit is contained in:
Matt Bierner
2019-06-20 11:54:26 -07:00
parent f4b6f17ca3
commit 5ec5ca6f2c
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/vs/workbench/contrib/webview/browser/pre/service-worker.js
View File

@@ -29,10 +29,11 @@ class RequestStore {
/**
* @param {string} webviewId
* @param {string} path
* @return {RequestStoreEntry<T> | undefined}
* @return {Promise<T> | undefined}
*/
get(webviewId, path) {
return this.map.get(this._key(webviewId, path));
const entry = this.map.get(this._key(webviewId, path));
return entry && entry.promise;
}
/**
@@ -43,18 +44,19 @@ class RequestStore {
create(webviewId, path) {
const existing = this.get(webviewId, path);
if (existing) {
return existing.promise;
return existing;
}
let resolve;
const promise = new Promise(r => resolve = r);
const entry = { resolve, promise };
this.map.set(this._key(webviewId, path), entry);
const key = this._key(webviewId, path);
this.map.set(key, entry);
const dispose = () => {
clearTimeout(timeout);
const existing = this.get(webviewId, path);
if (existing === entry) {
return this.map.delete(this._key(webviewId, path));
const existingEntry = this.map.get(key);
if (existingEntry === entry) {
return this.map.delete(key);
}
};
const timeout = setTimeout(dispose, resolveTimeout);
@@ -68,7 +70,7 @@ class RequestStore {
* @return {boolean}
*/
resolve(webviewId, path, result) {
const entry = this.get(webviewId, path);
const entry = this.map.get(this._key(webviewId, path));
if (!entry) {
return false;
}
@@ -185,7 +187,7 @@ async function processResourceRequest(event, requestUrl) {
// Check if we've already resolved this request
const existing = resourceRequestStore.get(webviewId, resourcePath);
if (existing) {
return existing.promise.then(resolveResourceEntry);
return existing.then(resolveResourceEntry);
}
parentClient.postMessage({
@@ -233,7 +235,7 @@ async function processLocalhostRequest(event, requestUrl) {
// Check if we've already resolved this request
const existing = localhostRequestStore.get(webviewId, origin);
if (existing) {
return existing.promise.then(resolveRedirect);
return existing.then(resolveRedirect);
}
parentClient.postMessage({