From 53e80cb0a61fc747a676b4b2f056d80f7acc9cb3 Mon Sep 17 00:00:00 2001 From: Rob Lourens Date: Wed, 5 Sep 2018 15:02:04 -0700 Subject: [PATCH] Add nicer activation description to "Running extensions" editor --- src/vs/workbench/node/extensionHostMain.ts | 2 +- .../electron-browser/runtimeExtensionsEditor.ts | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/vs/workbench/node/extensionHostMain.ts b/src/vs/workbench/node/extensionHostMain.ts index 36d33d60571..5a08660ab74 100644 --- a/src/vs/workbench/node/extensionHostMain.ts +++ b/src/vs/workbench/node/extensionHostMain.ts @@ -276,7 +276,7 @@ export class ExtensionHostMain { const timer = setTimeout(async () => { await this._mainThreadWorkspace.$cancelSearch(requestId); - this._extensionService.activateById(extensionId, new ExtensionActivatedByEvent(true, `workspaceContainsTimeout`)) + this._extensionService.activateById(extensionId, new ExtensionActivatedByEvent(true, `workspaceContainsTimeout:${globPatterns.join(',')}`)) .then(null, err => console.error(err)); }, ExtensionHostMain.WORKSPACE_CONTAINS_TIMEOUT); diff --git a/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.ts b/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.ts index 5d43bb9b587..470724893b1 100644 --- a/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.ts +++ b/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.ts @@ -318,6 +318,14 @@ export class RuntimeExtensionsEditor extends BaseEditor { ] }, "Activated because file {0} exists in your workspace", fileNameOrGlob); } + } else if (/^workspaceContainsTimeout:/.test(activationTimes.activationEvent)) { + const glob = activationTimes.activationEvent.substr('workspaceContainsTimeout:'.length); + title = nls.localize({ + key: 'workspaceContainsTimeout', + comment: [ + '{0} will be a glob pattern' + ] + }, "Activated because searching for {0} took too long", glob); } else if (/^onLanguage:/.test(activationTimes.activationEvent)) { let language = activationTimes.activationEvent.substr('onLanguage:'.length); title = nls.localize('languageActivation', "Activated because you opened a {0} file", language); -- GitLab