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

sync api to access extensions #161519

Merged
merged 1 commit into from Sep 23, 2022
Merged

sync api to access extensions #161519

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
4 changes: 2 additions & 2 deletions src/vs/workbench/contrib/debug/browser/debugConfigurationManager.ts
View file
Open in desktop
Expand Up @@ -164,9 +164,9 @@ export class ConfigurationManager implements IConfigurationManager {
}

async getDynamicProviders(): Promise<{ label: string; type: string; getProvider: () => Promise<IDebugConfigurationProvider | undefined>; pick: () => Promise<{ launch: ILaunch; config: IConfig } | undefined> }[]> {
const extensions = await this.extensionService.getExtensions();
await this.extensionService.whenInstalledExtensionsRegistered();
const onDebugDynamicConfigurationsName = 'onDebugDynamicConfigurations';
const debugDynamicExtensionsTypes = extensions.reduce((acc, e) => {
const debugDynamicExtensionsTypes = this.extensionService.extensions.reduce((acc, e) => {
if (!e.activationEvents) {
return acc;
}
Expand Down
3 changes: 2 additions & 1 deletion src/vs/workbench/contrib/extensions/browser/abstractRuntimeExtensionsEditor.ts
View file
Open in desktop
Expand Up @@ -100,7 +100,8 @@ export abstract class AbstractRuntimeExtensionsEditor extends EditorPane {

private async _resolveExtensions(): Promise<IRuntimeExtension[]> {
// We only deal with extensions with source code!
const extensionsDescriptions = (await this._extensionService.getExtensions()).filter((extension) => {
await this._extensionService.whenInstalledExtensionsRegistered();
const extensionsDescriptions = this._extensionService.extensions.filter((extension) => {
return Boolean(extension.main) || Boolean(extension.browser);
});
const marketplaceMap: { [id: string]: IExtension } = Object.create(null);
Expand Down
80 changes: 27 additions & 53 deletions src/vs/workbench/contrib/extensions/browser/extensionsActions.ts
View file
Open in desktop
Expand Up @@ -1076,7 +1076,7 @@ export class ManageExtensionAction extends ExtensionDropDownAction {
this.update();
}

async getActionGroups(runningExtensions: IExtensionDescription[]): Promise<IAction[][]> {
async getActionGroups(): Promise<IAction[][]> {
const groups: IAction[][] = [];
const contextMenuActionsGroups = await getContextMenuActionsGroups(this.extension, this.contextKeyService, this.instantiationService);
const themeActions: IAction[] = [], installActions: IAction[] = [], otherActionGroups: IAction[][] = [];
Expand All @@ -1099,8 +1099,8 @@ export class ManageExtensionAction extends ExtensionDropDownAction {
this.instantiationService.createInstance(EnableForWorkspaceAction)
]);
groups.push([
this.instantiationService.createInstance(DisableGloballyAction, runningExtensions),
this.instantiationService.createInstance(DisableForWorkspaceAction, runningExtensions)
this.instantiationService.createInstance(DisableGloballyAction),
this.instantiationService.createInstance(DisableForWorkspaceAction)
]);
groups.push([
...(installActions.length ? installActions : []),
Expand All @@ -1120,8 +1120,8 @@ export class ManageExtensionAction extends ExtensionDropDownAction {
}

override async run(): Promise<any> {
const runtimeExtensions = await this.extensionService.getExtensions();
return super.run({ actionGroups: await this.getActionGroups(runtimeExtensions), disposeActionsOnHide: true });
await this.extensionService.whenInstalledExtensionsRegistered();
return super.run({ actionGroups: await this.getActionGroups(), disposeActionsOnHide: true });
}

update(): void {
Expand Down Expand Up @@ -1372,24 +1372,21 @@ export class DisableForWorkspaceAction extends ExtensionAction {
static readonly ID = 'extensions.disableForWorkspace';
static readonly LABEL = localize('disableForWorkspaceAction', "Disable (Workspace)");

constructor(private _runningExtensions: IExtensionDescription[],
constructor(
@IWorkspaceContextService private readonly workspaceContextService: IWorkspaceContextService,
@IExtensionsWorkbenchService private readonly extensionsWorkbenchService: IExtensionsWorkbenchService,
@IWorkbenchExtensionEnablementService private readonly extensionEnablementService: IWorkbenchExtensionEnablementService
@IWorkbenchExtensionEnablementService private readonly extensionEnablementService: IWorkbenchExtensionEnablementService,
@IExtensionService private readonly extensionService: IExtensionService,
) {
super(DisableForWorkspaceAction.ID, DisableForWorkspaceAction.LABEL, ExtensionAction.LABEL_ACTION_CLASS);
this.tooltip = localize('disableForWorkspaceActionToolTip', "Disable this extension only in this workspace");
this.update();
}

set runningExtensions(runningExtensions: IExtensionDescription[]) {
this._runningExtensions = runningExtensions;
this.update();
this._register(this.extensionService.onDidChangeExtensions(() => this.update()));
}

update(): void {
this.enabled = false;
if (this.extension && this.extension.local && this._runningExtensions.some(e => areSameExtensions({ id: e.identifier.value, uuid: e.uuid }, this.extension!.identifier) && this.workspaceContextService.getWorkbenchState() !== WorkbenchState.EMPTY)) {
if (this.extension && this.extension.local && this.extensionService.extensions.some(e => areSameExtensions({ id: e.identifier.value, uuid: e.uuid }, this.extension!.identifier) && this.workspaceContextService.getWorkbenchState() !== WorkbenchState.EMPTY)) {
this.enabled = this.extension.state === ExtensionState.Installed
&& (this.extension.enablementState === EnablementState.EnabledGlobally || this.extension.enablementState === EnablementState.EnabledWorkspace)
&& this.extensionEnablementService.canChangeWorkspaceEnablement(this.extension.local);
Expand All @@ -1410,23 +1407,19 @@ export class DisableGloballyAction extends ExtensionAction {
static readonly LABEL = localize('disableGloballyAction', "Disable");

constructor(
private _runningExtensions: IExtensionDescription[],
@IExtensionsWorkbenchService private readonly extensionsWorkbenchService: IExtensionsWorkbenchService,
@IWorkbenchExtensionEnablementService private readonly extensionEnablementService: IWorkbenchExtensionEnablementService
@IWorkbenchExtensionEnablementService private readonly extensionEnablementService: IWorkbenchExtensionEnablementService,
@IExtensionService private readonly extensionService: IExtensionService,
) {
super(DisableGloballyAction.ID, DisableGloballyAction.LABEL, ExtensionAction.LABEL_ACTION_CLASS);
this.tooltip = localize('disableGloballyActionToolTip', "Disable this extension");
this.update();
}

set runningExtensions(runningExtensions: IExtensionDescription[]) {
this._runningExtensions = runningExtensions;
this.update();
this._register(this.extensionService.onDidChangeExtensions(() => this.update()));
}

update(): void {
this.enabled = false;
if (this.extension && this.extension.local && this._runningExtensions.some(e => areSameExtensions({ id: e.identifier.value, uuid: e.uuid }, this.extension!.identifier))) {
if (this.extension && this.extension.local && this.extensionService.extensions.some(e => areSameExtensions({ id: e.identifier.value, uuid: e.uuid }, this.extension!.identifier))) {
this.enabled = this.extension.state === ExtensionState.Installed
&& (this.extension.enablementState === EnablementState.EnabledGlobally || this.extension.enablementState === EnablementState.EnabledWorkspace)
&& this.extensionEnablementService.canChangeEnablement(this.extension.local);
Expand Down Expand Up @@ -1458,21 +1451,12 @@ export class EnableDropDownAction extends ActionWithDropDownAction {
export class DisableDropDownAction extends ActionWithDropDownAction {

constructor(
@IExtensionService extensionService: IExtensionService,
@IInstantiationService instantiationService: IInstantiationService
) {
const actions = [
instantiationService.createInstance(DisableGloballyAction, []),
instantiationService.createInstance(DisableForWorkspaceAction, [])
];
super('extensions.disable', localize('disableAction', "Disable"), [actions]);

const updateRunningExtensions = async () => {
const runningExtensions = await extensionService.getExtensions();
actions.forEach(a => a.runningExtensions = runningExtensions);
};
updateRunningExtensions();
this._register(extensionService.onDidChangeExtensions(() => updateRunningExtensions()));
super('extensions.disable', localize('disableAction', "Disable"), [[
instantiationService.createInstance(DisableGloballyAction),
instantiationService.createInstance(DisableForWorkspaceAction)
]]);
}

}
Expand Down Expand Up @@ -2074,14 +2058,12 @@ export class ExtensionStatusLabelAction extends Action implements IExtensionCont
}

update(): void {
this.computeLabel()
.then(label => {
this.label = label || '';
this.class = label ? ExtensionStatusLabelAction.ENABLED_CLASS : ExtensionStatusLabelAction.DISABLED_CLASS;
});
const label = this.computeLabel();
this.label = label || '';
this.class = label ? ExtensionStatusLabelAction.ENABLED_CLASS : ExtensionStatusLabelAction.DISABLED_CLASS;
}

private async computeLabel(): Promise<string | null> {
private computeLabel(): string | null {
if (!this.extension) {
return null;
}
Expand All @@ -2094,9 +2076,8 @@ export class ExtensionStatusLabelAction extends Action implements IExtensionCont
}
this.enablementState = this.extension.enablementState;

const runningExtensions = await this.extensionService.getExtensions();
const canAddExtension = () => {
const runningExtension = runningExtensions.filter(e => areSameExtensions({ id: e.identifier.value, uuid: e.uuid }, this.extension!.identifier))[0];
const runningExtension = this.extensionService.extensions.filter(e => areSameExtensions({ id: e.identifier.value, uuid: e.uuid }, this.extension!.identifier))[0];
if (this.extension!.local) {
if (runningExtension && this.extension!.version === runningExtension.version) {
return true;
Expand All @@ -2107,7 +2088,7 @@ export class ExtensionStatusLabelAction extends Action implements IExtensionCont
};
const canRemoveExtension = () => {
if (this.extension!.local) {
if (runningExtensions.every(e => !(areSameExtensions({ id: e.identifier.value, uuid: e.uuid }, this.extension!.identifier) && this.extension!.server === this.extensionManagementServerService.getExtensionManagementServer(toExtension(e))))) {
if (this.extensionService.extensions.every(e => !(areSameExtensions({ id: e.identifier.value, uuid: e.uuid }, this.extension!.identifier) && this.extension!.server === this.extensionManagementServerService.getExtensionManagementServer(toExtension(e))))) {
return true;
}
return this.extensionService.canRemoveExtension(toExtensionDescription(this.extension!.local));
Expand Down Expand Up @@ -2193,7 +2174,6 @@ export class ExtensionStatusAction extends ExtensionAction {
private static readonly CLASS = `${ExtensionAction.ICON_ACTION_CLASS} extension-status`;

updateWhenCounterExtensionChanges: boolean = true;
private _runningExtensions: IExtensionDescription[] | null = null;

private _status: ExtensionStatus | undefined;
get status(): ExtensionStatus | undefined { return this._status; }
Expand All @@ -2218,15 +2198,10 @@ export class ExtensionStatusAction extends ExtensionAction {
) {
super('extensions.status', '', `${ExtensionStatusAction.CLASS} hide`, false);
this._register(this.labelService.onDidChangeFormatters(() => this.update(), this));
this._register(this.extensionService.onDidChangeExtensions(this.updateRunningExtensions, this));
this.updateRunningExtensions();
this._register(this.extensionService.onDidChangeExtensions(() => this.update()));
this.update();
}

private updateRunningExtensions(): void {
this.extensionService.getExtensions().then(runningExtensions => { this._runningExtensions = runningExtensions; this.update(); });
}

update(): void {
this.updateThrottler.queue(() => this.computeAndUpdateStatus());
}
Expand Down Expand Up @@ -2279,7 +2254,6 @@ export class ExtensionStatusAction extends ExtensionAction {

if (!this.extension.local ||
!this.extension.server ||
!this._runningExtensions ||
this.extension.state !== ExtensionState.Installed
) {
return;
Expand Down Expand Up @@ -2380,7 +2354,7 @@ export class ExtensionStatusAction extends ExtensionAction {
return;
}

const runningExtension = this._runningExtensions.filter(e => areSameExtensions({ id: e.identifier.value, uuid: e.uuid }, this.extension!.identifier))[0];
const runningExtension = this.extensionService.extensions.filter(e => areSameExtensions({ id: e.identifier.value, uuid: e.uuid }, this.extension!.identifier))[0];
const runningExtensionServer = runningExtension ? this.extensionManagementServerService.getExtensionManagementServer(toExtension(runningExtension)) : null;
if (this.extension.server === this.extensionManagementServerService.localExtensionManagementServer && runningExtensionServer === this.extensionManagementServerService.remoteExtensionManagementServer) {
if (this.extensionManifestPropertiesService.prefersExecuteOnWorkspace(this.extension.local!.manifest)) {
Expand Down Expand Up @@ -2411,7 +2385,7 @@ export class ExtensionStatusAction extends ExtensionAction {
}

const isEnabled = this.workbenchExtensionEnablementService.isEnabled(this.extension.local);
const isRunning = this._runningExtensions.some(e => areSameExtensions({ id: e.identifier.value, uuid: e.uuid }, this.extension!.identifier));
const isRunning = this.extensionService.extensions.some(e => areSameExtensions({ id: e.identifier.value, uuid: e.uuid }, this.extension!.identifier));

if (isEnabled && isRunning) {
if (this.extensionManagementServerService.localExtensionManagementServer && this.extensionManagementServerService.remoteExtensionManagementServer) {
Expand Down
6 changes: 3 additions & 3 deletions src/vs/workbench/contrib/extensions/browser/extensionsDependencyChecker.ts
View file
Open in desktop
Expand Up @@ -43,10 +43,10 @@ export class ExtensionDependencyChecker extends Disposable implements IWorkbench
}

private async getAllMissingDependencies(): Promise<string[]> {
const runningExtensions = await this.extensionService.getExtensions();
const runningExtensionsIds: Set<string> = runningExtensions.reduce((result, r) => { result.add(r.identifier.value.toLowerCase()); return result; }, new Set<string>());
await this.extensionService.whenInstalledExtensionsRegistered();
const runningExtensionsIds: Set<string> = this.extensionService.extensions.reduce((result, r) => { result.add(r.identifier.value.toLowerCase()); return result; }, new Set<string>());
const missingDependencies: Set<string> = new Set<string>();
for (const extension of runningExtensions) {
for (const extension of this.extensionService.extensions) {
if (extension.extensionDependencies) {
extension.extensionDependencies.forEach(dep => {
if (!runningExtensionsIds.has(dep.toLowerCase())) {
Expand Down
3 changes: 1 addition & 2 deletions src/vs/workbench/contrib/extensions/browser/extensionsList.ts
View file
Open in desktop
Expand Up @@ -198,8 +198,7 @@ export class Renderer implements IPagedRenderer<IExtension, ITemplateData> {
}
return !(await this.extensionsWorkbenchService.canInstall(extension));
} else if (extension.local && !isLanguagePackExtension(extension.local.manifest)) {
const runningExtensions = await this.extensionService.getExtensions();
const runningExtension = runningExtensions.filter(e => areSameExtensions({ id: e.identifier.value, uuid: e.uuid }, extension.identifier))[0];
const runningExtension = this.extensionService.extensions.filter(e => areSameExtensions({ id: e.identifier.value, uuid: e.uuid }, extension.identifier))[0];
return !(runningExtension && extension.server === this.extensionManagementServerService.getExtensionManagementServer(toExtension(runningExtension)));
}
return false;
Expand Down