From 16625563408524e451171eb27e2d7c69de209c98 Mon Sep 17 00:00:00 2001 From: Jackson Kearl Date: Mon, 25 Jun 2018 15:21:49 -0700 Subject: [PATCH] Fix race bug (#52843) * Fix race bug * replace the fix with a fix that actualy fixes * Remove unused import --- .../electron-browser/extensionTipsService.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.ts index 2a77811139a..d64b5397088 100644 --- a/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.ts +++ b/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.ts @@ -213,7 +213,7 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe Object.keys(this._sessionRestoredRecommendations).forEach(x => output[x.toLowerCase()] = { reasonId: this._sessionRestoredRecommendations[x].reasonId, - reasonText: localize('restoredRecommendation', "You will receive recommendations for this extension in your next VS Code session.") + reasonText: localize('restoredRecommendation', "You will receive recommendations for this extension in your future VS Code sessions.") }); return output; @@ -226,7 +226,7 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe private fetchWorkspaceRecommendations(): TPromise { this._workspaceIgnoredRecommendations = []; - this._allWorkspaceRecommendedExtensions = []; + const tmpAllWorkspaceRecommendations = []; if (!this.isEnabled) { return TPromise.as(null); } @@ -255,10 +255,10 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe for (const r of contentsBySource.contents.recommendations) { const extensionId = r.toLowerCase(); if (invalidExtensions.indexOf(extensionId) === -1) { - let recommendation = this._allWorkspaceRecommendedExtensions.filter(r => r.extensionId === extensionId)[0]; + let recommendation = tmpAllWorkspaceRecommendations.filter(r => r.extensionId === extensionId)[0]; if (!recommendation) { recommendation = { extensionId, sources: [] }; - this._allWorkspaceRecommendedExtensions.push(recommendation); + tmpAllWorkspaceRecommendations.push(recommendation); } if (recommendation.sources.indexOf(contentsBySource.source) === -1) { recommendation.sources.push(contentsBySource.source); @@ -267,7 +267,7 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe } } } - + this._allWorkspaceRecommendedExtensions = tmpAllWorkspaceRecommendations; this._allIgnoredRecommendations = distinct([...this._globallyIgnoredRecommendations, ...this._workspaceIgnoredRecommendations]); this.refilterAllRecommendations(); })); -- GitLab