Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow users to see installed extensions while offline #55273

Merged
merged 1 commit into from
Jul 27, 2018
Merged

Allow users to see installed extensions while offline #55273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
37 changes: 17 additions & 20 deletions src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
.then(content => <IExtensionsConfigContent>json.parse(content.value), err => null);
}

private validateExtensions(contents: IExtensionsConfigContent[]): TPromise<{ invalidExtensions: string[], message: string }> {
private async validateExtensions(contents: IExtensionsConfigContent[]): TPromise<{ invalidExtensions: string[], message: string }> {
const extensionsContent: IExtensionsConfigContent = {
recommendations: distinct(flatten(contents.map(content => content.recommendations || []))),
unwantedRecommendations: distinct(flatten(contents.map(content => content.unwantedRecommendations || [])))
Expand Down Expand Up @@ -339,27 +339,24 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe

const filteredWanted = regexFilter(extensionsContent.recommendations || []).map(x => x.toLowerCase());

if (!filteredWanted.length) {
return TPromise.as({ invalidExtensions, message });
}

return this._galleryService.query({ names: filteredWanted }).then(pager => {
let page = pager.firstPage;
let validRecommendations = page.map(extension => {
return extension.identifier.id.toLowerCase();
});
if (filteredWanted.length) {
try {
let validRecommendations = (await this._galleryService.query({ names: filteredWanted })).firstPage
.map(extension => extension.identifier.id.toLowerCase());

if (validRecommendations.length !== filteredWanted.length) {
filteredWanted.forEach(element => {
if (validRecommendations.indexOf(element.toLowerCase()) === -1) {
invalidExtensions.push(element.toLowerCase());
message += `${element} (not found in marketplace)\n`;
}
});
if (validRecommendations.length !== filteredWanted.length) {
filteredWanted.forEach(element => {
if (validRecommendations.indexOf(element.toLowerCase()) === -1) {
invalidExtensions.push(element.toLowerCase());
message += `${element} (not found in marketplace)\n`;
}
});
}
} catch (e) {
console.warn('Error querying extensions gallery', e);
}

return TPromise.as({ invalidExtensions, message });
});
}
return { invalidExtensions, message };
}

private isExtensionAllowedToBeRecommended(id: string): boolean {
Expand Down
5 changes: 4 additions & 1 deletion src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,10 @@ export class ExtensionsListView extends ViewletPanel {
}

async show(query: string): Promise<IPagedModel<IExtension>> {
const model = await this.query(query);
const model = await this.query(query).catch(e => {
console.warn('Error querying extensions gallery', e);
return new PagedModel([]);
});
this.setModel(model);
return model;
}
Expand Down