ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-03-29 16:20:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode 8df646d3c5477b02737fc10343fa7cf0cc3f606b

Browse Source
This commit is contained in:
ADS Merger
2020-03-25 06:20:54 +00:00
parent 6e5fbc9012
commit d810da9d87
114 changed files with 2036 additions and 797 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/vs/workbench/contrib/extensions/browser/extensionsQuickAccess.ts
View File

@@ -48,12 +48,10 @@ export class InstallExtensionQuickAccessProvider extends PickerQuickAccessProvid
}
// Extension name typed: offer to search it
else {
return [genericSearchPickItem];
}
return [genericSearchPickItem];
}
protected async getPicksForExtensionId(filter: string, fallback: IPickerQuickAccessItem, token: CancellationToken): Promise<Array<IPickerQuickAccessItem | IQuickPickSeparator>> {
private async getPicksForExtensionId(filter: string, fallback: IPickerQuickAccessItem, token: CancellationToken): Promise<Array<IPickerQuickAccessItem | IQuickPickSeparator>> {
try {
const galleryResult = await this.galleryService.query({ names: [filter], pageSize: 1 }, token);
if (token.isCancellationRequested) {
@@ -63,12 +61,12 @@ export class InstallExtensionQuickAccessProvider extends PickerQuickAccessProvid
const galleryExtension = galleryResult.firstPage[0];
if (!galleryExtension) {
return [fallback];
} else {
return [{
label: localize('install', "Press Enter to install extension '{0}'.", filter),
accept: () => this.installExtension(galleryExtension, filter)
}];
}
return [{
label: localize('install', "Press Enter to install extension '{0}'.", filter),
accept: () => this.installExtension(galleryExtension, filter)
}];
} catch (error) {
if (token.isCancellationRequested) {
return []; // expected error