Skip to content

bring back onTaskType implicit activation, set timeout for extension activation #176248

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

Merged
merged 4 commits into from
Mar 7, 2023
Merged

bring back onTaskType implicit activation, set timeout for extension activation #176248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6e2ecbb
Revert "Revert "Adopt `activationEventsGenerator` for `onTaskType` (#…
meganrogge Mar 6, 2023
9048de7
add race
meganrogge Mar 6, 2023
f8a9f98
Return
meganrogge Mar 6, 2023
52c107a
fix Promise.race
meganrogge Mar 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ import { IPreferencesService } from 'vs/workbench/services/preferences/common/pr
import { TerminalExitReason } from 'vs/platform/terminal/common/terminal';
import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
import { timeout } from 'vs/base/common/async';

const QUICKOPEN_HISTORY_LIMIT_CONFIG = 'task.quickOpen.history';
const PROBLEM_MATCHER_NEVER_CONFIG = 'task.problemMatchers.neverPrompt';
Expand Down Expand Up @@ -574,10 +575,14 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
// We need to first wait for extensions to be registered because we might read
// the `TaskDefinitionRegistry` in case `type` is `undefined`
await this._extensionService.whenInstalledExtensionsRegistered();

await Promise.all(
this._getActivationEvents(type).map(activationEvent => this._extensionService.activateByEvent(activationEvent))
);
// Wait for the first of either to resolve
await Promise.race([
// Create a promise that resolves when all activation promises resolve
Promise.all(
this._getActivationEvents(type).map(activationEvent => this._extensionService.activateByEvent(activationEvent))
),
timeout(5000).then(() => console.warn('Timed out activating extensions for task providers'))
]);
}

private _updateSetup(setup?: [IWorkspaceFolder[], IWorkspaceFolder[], ExecutionEngine, JsonSchemaVersion, IWorkspace | undefined]): void {
Expand Down
7 changes: 7 additions & 0 deletions src/vs/workbench/contrib/tasks/common/taskDefinitionRegistry.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,13 @@ namespace Configuration {

const taskDefinitionsExtPoint = ExtensionsRegistry.registerExtensionPoint<Configuration.ITaskDefinition[]>({
extensionPoint: 'taskDefinitions',
activationEventsGenerator: (contributions: Configuration.ITaskDefinition[], result: { push(item: string): void }) => {
for (const task of contributions) {
if (task.type) {
result.push(`onTaskType:${task.type}`);
}
}
},
jsonSchema: {
description: nls.localize('TaskDefinitionExtPoint', 'Contributes task kinds'),
type: 'array',
Expand Down