From 21ca27da48867b54e0ec64a9f6dc9a5352c0bf5d Mon Sep 17 00:00:00 2001 From: Alex Ross Date: Tue, 17 Dec 2019 09:51:55 +0000 Subject: [PATCH] strictFunctionTypes for mainThreadTask and extHostTreeViews Part of #81574 --- .../workbench/api/browser/mainThreadTask.ts | 22 +++++++++++-------- .../api/extHostTreeViews.test.ts | 2 +- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/src/vs/workbench/api/browser/mainThreadTask.ts b/src/vs/workbench/api/browser/mainThreadTask.ts index 5e9120d8360..79ae97c0082 100644 --- a/src/vs/workbench/api/browser/mainThreadTask.ts +++ b/src/vs/workbench/api/browser/mainThreadTask.ts @@ -514,15 +514,19 @@ export class MainThreadTask implements MainThreadTaskShape { if (TaskHandleDTO.is(value)) { const workspaceFolder = this._workspaceContextServer.getWorkspaceFolder(URI.revive(value.workspaceFolder)); if (workspaceFolder) { - this._taskService.getTask(workspaceFolder, value.id, true).then((task: Task) => { - this._taskService.run(task).then(undefined, reason => { - // eat the error, it has already been surfaced to the user and we don't care about it here - }); - const result: TaskExecutionDTO = { - id: value.id, - task: TaskDTO.from(task) - }; - resolve(result); + this._taskService.getTask(workspaceFolder, value.id, true).then((task: Task | undefined) => { + if (!task) { + reject(new Error('Task not found')); + } else { + this._taskService.run(task).then(undefined, reason => { + // eat the error, it has already been surfaced to the user and we don't care about it here + }); + const result: TaskExecutionDTO = { + id: value.id, + task: TaskDTO.from(task) + }; + resolve(result); + } }, (_error) => { reject(new Error('Task not found')); }); diff --git a/src/vs/workbench/test/electron-browser/api/extHostTreeViews.test.ts b/src/vs/workbench/test/electron-browser/api/extHostTreeViews.test.ts index bc50a3dd00a..fb419d8e700 100644 --- a/src/vs/workbench/test/electron-browser/api/extHostTreeViews.test.ts +++ b/src/vs/workbench/test/electron-browser/api/extHostTreeViews.test.ts @@ -75,7 +75,7 @@ suite('ExtHostTreeView', function () { rpcProtocol, new NullLogService() ), new NullLogService()); - onDidChangeTreeNode = new Emitter<{ key: string }>(); + onDidChangeTreeNode = new Emitter<{ key: string } | undefined>(); onDidChangeTreeNodeWithId = new Emitter<{ key: string }>(); testObject.createTreeView('testNodeTreeProvider', { treeDataProvider: aNodeTreeDataProvider() }, { enableProposedApi: true } as IExtensionDescription); testObject.createTreeView('testNodeWithIdTreeProvider', { treeDataProvider: aNodeWithIdTreeDataProvider() }, { enableProposedApi: true } as IExtensionDescription);