提交 16625563 编写于 作者: J Jackson Kearl 提交者: Ramya Rao

Fix race bug (#52843)

* Fix race bug

* replace the fix with a fix that actualy fixes

* Remove unused import
上级 0b079362
...@@ -213,7 +213,7 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe ...@@ -213,7 +213,7 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
Object.keys(this._sessionRestoredRecommendations).forEach(x => output[x.toLowerCase()] = { Object.keys(this._sessionRestoredRecommendations).forEach(x => output[x.toLowerCase()] = {
reasonId: this._sessionRestoredRecommendations[x].reasonId, 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; return output;
...@@ -226,7 +226,7 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe ...@@ -226,7 +226,7 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
private fetchWorkspaceRecommendations(): TPromise<void> { private fetchWorkspaceRecommendations(): TPromise<void> {
this._workspaceIgnoredRecommendations = []; this._workspaceIgnoredRecommendations = [];
this._allWorkspaceRecommendedExtensions = []; const tmpAllWorkspaceRecommendations = [];
if (!this.isEnabled) { return TPromise.as(null); } if (!this.isEnabled) { return TPromise.as(null); }
...@@ -255,10 +255,10 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe ...@@ -255,10 +255,10 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
for (const r of contentsBySource.contents.recommendations) { for (const r of contentsBySource.contents.recommendations) {
const extensionId = r.toLowerCase(); const extensionId = r.toLowerCase();
if (invalidExtensions.indexOf(extensionId) === -1) { 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) { if (!recommendation) {
recommendation = { extensionId, sources: [] }; recommendation = { extensionId, sources: [] };
this._allWorkspaceRecommendedExtensions.push(recommendation); tmpAllWorkspaceRecommendations.push(recommendation);
} }
if (recommendation.sources.indexOf(contentsBySource.source) === -1) { if (recommendation.sources.indexOf(contentsBySource.source) === -1) {
recommendation.sources.push(contentsBySource.source); recommendation.sources.push(contentsBySource.source);
...@@ -267,7 +267,7 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe ...@@ -267,7 +267,7 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
} }
} }
} }
this._allWorkspaceRecommendedExtensions = tmpAllWorkspaceRecommendations;
this._allIgnoredRecommendations = distinct([...this._globallyIgnoredRecommendations, ...this._workspaceIgnoredRecommendations]); this._allIgnoredRecommendations = distinct([...this._globallyIgnoredRecommendations, ...this._workspaceIgnoredRecommendations]);
this.refilterAllRecommendations(); this.refilterAllRecommendations();
})); }));
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册