From 9193befba441e75aa7d06a9fec4d52b0dec6389b Mon Sep 17 00:00:00 2001 From: meganrogge Date: Tue, 5 Jul 2022 09:56:38 -0400 Subject: [PATCH 01/16] fix #149095 --- .../workbench/contrib/tasks/browser/taskQuickPick.ts | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/vs/workbench/contrib/tasks/browser/taskQuickPick.ts b/src/vs/workbench/contrib/tasks/browser/taskQuickPick.ts index 77dc6f60769e2..fa6e79faab5ac 100644 --- a/src/vs/workbench/contrib/tasks/browser/taskQuickPick.ts +++ b/src/vs/workbench/contrib/tasks/browser/taskQuickPick.ts @@ -24,7 +24,7 @@ import { TaskQuickPickEntryType } from 'vs/workbench/contrib/tasks/browser/abstr export const QUICKOPEN_DETAIL_CONFIG = 'task.quickOpen.detail'; export const QUICKOPEN_SKIP_CONFIG = 'task.quickOpen.skip'; - +const HIDDEN_TASK_PREFIX = '__'; export function isWorkspaceFolder(folder: IWorkspace | IWorkspaceFolder): folder is IWorkspaceFolder { return 'uri' in folder; } @@ -108,7 +108,9 @@ export class TaskQuickPick extends Disposable { groupLabel: string, extraButtons: IQuickInputButton[] = []) { entries.push({ type: 'separator', label: groupLabel }); tasks.forEach(task => { - entries.push(this._createTaskEntry(task, extraButtons)); + if (!task._label.startsWith(HIDDEN_TASK_PREFIX)) { + entries.push(this._createTaskEntry(task, extraButtons)); + } }); } @@ -304,7 +306,7 @@ export class TaskQuickPick extends Disposable { private async _doPickerSecondLevel(picker: IQuickPick, type: string) { picker.busy = true; if (type === SHOW_ALL) { - const items = (await this._taskService.tasks()).sort((a, b) => this._sorter.compare(a, b)).map(task => this._createTaskEntry(task)); + const items = (await this._taskService.tasks()).filter(t => !t._label.startsWith(HIDDEN_TASK_PREFIX)).sort((a, b) => this._sorter.compare(a, b)).map(task => this._createTaskEntry(task)); items.push(...TaskQuickPick.allSettingEntries(this._configurationService)); picker.items = items; } else { @@ -355,7 +357,7 @@ export class TaskQuickPick extends Disposable { const tasks = (await this._taskService.tasks({ type })).sort((a, b) => this._sorter.compare(a, b)); let taskQuickPickEntries: QuickPickInput[]; if (tasks.length > 0) { - taskQuickPickEntries = tasks.map(task => this._createTaskEntry(task)); + taskQuickPickEntries = tasks.filter(t => !t._label.startsWith(HIDDEN_TASK_PREFIX)).map(task => this._createTaskEntry(task)); taskQuickPickEntries.push({ type: 'separator' }, { From af2418a8d96b3ba7f64e77aff0fb735f159abc94 Mon Sep 17 00:00:00 2001 From: meganrogge Date: Tue, 5 Jul 2022 20:33:50 -0400 Subject: [PATCH 02/16] add hide property --- .vscode/tasks.json | 20 ++++++++++++++--- .../workbench/api/browser/mainThreadTask.ts | 7 +++--- src/vs/workbench/api/common/shared/tasks.ts | 1 + .../tasks/browser/abstractTaskService.ts | 2 +- .../contrib/tasks/browser/taskQuickPick.ts | 13 ++++++----- .../tasks/browser/terminalTaskSystem.ts | 22 ++++++++++++++----- .../contrib/tasks/common/jsonSchema_v2.ts | 9 ++++++++ .../contrib/tasks/common/taskConfiguration.ts | 17 +++++++++----- .../workbench/contrib/tasks/common/tasks.ts | 11 ++++++++++ 9 files changed, 79 insertions(+), 23 deletions(-) diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 885f825cc2efb..152780208d05b 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -1,6 +1,13 @@ { "version": "2.0.0", "tasks": [ + { + "label": "test input", + "type": "shell", + "command": "echo", + "icon": {"id": "account"}, + "hide": true + }, { "type": "npm", "script": "watch-clientd", @@ -67,7 +74,8 @@ "kind": "build", "isDefault": true }, - "problemMatcher": [] + "problemMatcher": [], + "hide": true }, { "type": "npm", @@ -221,7 +229,7 @@ } }, { - "type": "npm", + "type": "${input:type}", "script": "tsec-compile-check", "problemMatcher": [ { @@ -234,5 +242,11 @@ "label": "npm: tsec-compile-check", "detail": "node_modules/tsec/bin/tsec -p src/tsconfig.json --noEmit" } - ] + ], + "inputs": [{ + "id": "type", + "options": ["npm", "shell"], + "type": "pickString", + "description": "the type of script to trun" + }] } diff --git a/src/vs/workbench/api/browser/mainThreadTask.ts b/src/vs/workbench/api/browser/mainThreadTask.ts index 69e679cc5b43c..d6193015b85c8 100644 --- a/src/vs/workbench/api/browser/mainThreadTask.ts +++ b/src/vs/workbench/api/browser/mainThreadTask.ts @@ -342,7 +342,7 @@ namespace TaskDTO { return result; } - export function to(task: ITaskDTO | undefined, workspace: IWorkspaceContextService, executeOnly: boolean, icon?: { id?: string; color?: string }): ContributedTask | undefined { + export function to(task: ITaskDTO | undefined, workspace: IWorkspaceContextService, executeOnly: boolean, icon?: { id?: string; color?: string }, hide?: boolean): ContributedTask | undefined { if (!task || (typeof task.name !== 'string')) { return undefined; } @@ -383,7 +383,8 @@ namespace TaskDTO { isBackground: !!task.isBackground, problemMatchers: task.problemMatchers.slice(), detail: task.detail, - icon + icon, + hide } ); return result; @@ -492,7 +493,7 @@ export class MainThreadTask implements MainThreadTaskShape { dto.name = ((dto.name === undefined) ? '' : dto.name); // Using an empty name causes the name to default to the one given by the provider. return Promise.resolve(this._proxy.$resolveTask(handle, dto)).then(resolvedTask => { if (resolvedTask) { - return TaskDTO.to(resolvedTask, this._workspaceContextServer, true, task.configurationProperties.icon); + return TaskDTO.to(resolvedTask, this._workspaceContextServer, true, task.configurationProperties.icon, task.configurationProperties.hide); } return undefined; diff --git a/src/vs/workbench/api/common/shared/tasks.ts b/src/vs/workbench/api/common/shared/tasks.ts index f7f206f06491c..6f0445ab3939b 100644 --- a/src/vs/workbench/api/common/shared/tasks.ts +++ b/src/vs/workbench/api/common/shared/tasks.ts @@ -78,6 +78,7 @@ export interface ITaskSourceDTO { scope?: number | UriComponents; color?: string; icon?: string; + hide?: boolean; } export interface ITaskHandleDTO { diff --git a/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts b/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts index 9ef8982eebe84..da7e0dccf583f 100644 --- a/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts +++ b/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts @@ -1588,7 +1588,7 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer { identifier: id, dependsOn: extensionTasks.map((extensionTask) => { return { uri: extensionTask.getWorkspaceFolder()!.uri, task: extensionTask._id }; }), - name: id, + name: id } ); return { task, resolver }; diff --git a/src/vs/workbench/contrib/tasks/browser/taskQuickPick.ts b/src/vs/workbench/contrib/tasks/browser/taskQuickPick.ts index fa6e79faab5ac..a2cc123e381c7 100644 --- a/src/vs/workbench/contrib/tasks/browser/taskQuickPick.ts +++ b/src/vs/workbench/contrib/tasks/browser/taskQuickPick.ts @@ -24,7 +24,6 @@ import { TaskQuickPickEntryType } from 'vs/workbench/contrib/tasks/browser/abstr export const QUICKOPEN_DETAIL_CONFIG = 'task.quickOpen.detail'; export const QUICKOPEN_SKIP_CONFIG = 'task.quickOpen.skip'; -const HIDDEN_TASK_PREFIX = '__'; export function isWorkspaceFolder(folder: IWorkspace | IWorkspaceFolder): folder is IWorkspaceFolder { return 'uri' in folder; } @@ -108,7 +107,7 @@ export class TaskQuickPick extends Disposable { groupLabel: string, extraButtons: IQuickInputButton[] = []) { entries.push({ type: 'separator', label: groupLabel }); tasks.forEach(task => { - if (!task._label.startsWith(HIDDEN_TASK_PREFIX)) { + if (!task.configurationProperties.hide) { entries.push(this._createTaskEntry(task, extraButtons)); } }); @@ -306,7 +305,7 @@ export class TaskQuickPick extends Disposable { private async _doPickerSecondLevel(picker: IQuickPick, type: string) { picker.busy = true; if (type === SHOW_ALL) { - const items = (await this._taskService.tasks()).filter(t => !t._label.startsWith(HIDDEN_TASK_PREFIX)).sort((a, b) => this._sorter.compare(a, b)).map(task => this._createTaskEntry(task)); + const items = (await this._taskService.tasks()).filter(t => !t.configurationProperties.hide).sort((a, b) => this._sorter.compare(a, b)).map(task => this._createTaskEntry(task)); items.push(...TaskQuickPick.allSettingEntries(this._configurationService)); picker.items = items; } else { @@ -355,9 +354,13 @@ export class TaskQuickPick extends Disposable { private async _getEntriesForProvider(type: string): Promise[]> { const tasks = (await this._taskService.tasks({ type })).sort((a, b) => this._sorter.compare(a, b)); - let taskQuickPickEntries: QuickPickInput[]; + let taskQuickPickEntries: QuickPickInput[] = []; if (tasks.length > 0) { - taskQuickPickEntries = tasks.filter(t => !t._label.startsWith(HIDDEN_TASK_PREFIX)).map(task => this._createTaskEntry(task)); + for (const task of tasks) { + if (!task.configurationProperties.hide) { + taskQuickPickEntries.push(this._createTaskEntry(task)); + } + } taskQuickPickEntries.push({ type: 'separator' }, { diff --git a/src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts b/src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts index d1dd693f37009..0beaded25b4bb 100644 --- a/src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts +++ b/src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts @@ -516,12 +516,7 @@ export class TerminalTaskSystem extends Disposable implements ITaskSystem { for (const dependency of task.configurationProperties.dependsOn) { const dependencyTask = await resolver.resolve(dependency.uri, dependency.task!); if (dependencyTask) { - if (dependencyTask.configurationProperties.icon) { - dependencyTask.configurationProperties.icon.id ||= task.configurationProperties.icon?.id; - dependencyTask.configurationProperties.icon.color ||= task.configurationProperties.icon?.color; - } else { - dependencyTask.configurationProperties.icon = task.configurationProperties.icon; - } + this._adoptConfigurationForDependencyTask(dependencyTask, task); const key = dependencyTask.getMapKey(); let promise = this._activeTasks[key] ? this._getDependencyPromise(this._activeTasks[key]) : undefined; if (!promise) { @@ -590,6 +585,21 @@ export class TerminalTaskSystem extends Disposable implements ITaskSystem { }); } + private _adoptConfigurationForDependencyTask(dependencyTask: Task, task: Task): void { + if (dependencyTask.configurationProperties.icon) { + dependencyTask.configurationProperties.icon.id ||= task.configurationProperties.icon?.id; + dependencyTask.configurationProperties.icon.color ||= task.configurationProperties.icon?.color; + } else { + dependencyTask.configurationProperties.icon = task.configurationProperties.icon; + } + + if (dependencyTask.configurationProperties.hide) { + dependencyTask.configurationProperties.hide ||= task.configurationProperties.hide; + } else { + dependencyTask.configurationProperties.hide = task.configurationProperties.hide; + } + } + private async _getDependencyPromise(task: IActiveTerminalData): Promise { if (!task.task.configurationProperties.isBackground) { return task.promise; diff --git a/src/vs/workbench/contrib/tasks/common/jsonSchema_v2.ts b/src/vs/workbench/contrib/tasks/common/jsonSchema_v2.ts index 077bd89a60ea2..cda3f44b17cea 100644 --- a/src/vs/workbench/contrib/tasks/common/jsonSchema_v2.ts +++ b/src/vs/workbench/contrib/tasks/common/jsonSchema_v2.ts @@ -45,6 +45,13 @@ const shellCommand: IJSONSchema = { deprecationMessage: nls.localize('JsonSchema.tasks.isShellCommand.deprecated', 'The property isShellCommand is deprecated. Use the type property of the task and the shell property in the options instead. See also the 1.14 release notes.') }; + +const hide: IJSONSchema = { + type: 'boolean', + description: nls.localize('JsonSchema.hide', 'Hide this task from the run task quickpick'), + default: true +}; + const taskIdentifier: IJSONSchema = { type: 'object', additionalProperties: true, @@ -407,6 +414,7 @@ const taskConfiguration: IJSONSchema = { }, presentation: Objects.deepClone(presentation), icon: Objects.deepClone(icon), + hide: Objects.deepClone(hide), options: options, problemMatcher: { $ref: '#/definitions/problemMatcherType', @@ -479,6 +487,7 @@ taskDescriptionProperties.command = Objects.deepClone(command); taskDescriptionProperties.args = Objects.deepClone(args); taskDescriptionProperties.isShellCommand = Objects.deepClone(shellCommand); taskDescriptionProperties.dependsOn = dependsOn; +taskDescriptionProperties.hide = Objects.deepClone(hide); taskDescriptionProperties.dependsOrder = dependsOrder; taskDescriptionProperties.identifier = Objects.deepClone(identifier); taskDescriptionProperties.type = Objects.deepClone(taskType); diff --git a/src/vs/workbench/contrib/tasks/common/taskConfiguration.ts b/src/vs/workbench/contrib/tasks/common/taskConfiguration.ts index c5d4058bcb034..0bb00f57620c2 100644 --- a/src/vs/workbench/contrib/tasks/common/taskConfiguration.ts +++ b/src/vs/workbench/contrib/tasks/common/taskConfiguration.ts @@ -362,6 +362,11 @@ export interface IConfigurationProperties { * The icon's color in the terminal tabs list */ color?: string; + + /** + * Do not show this task in the run task quickpick + */ + hide?: boolean; } export interface ICustomTask extends ICommandProperties, IConfigurationProperties { @@ -1322,7 +1327,8 @@ namespace ConfigurationProperties { { property: 'presentation', type: CommandConfiguration.PresentationOptions }, { property: 'problemMatchers' }, { property: 'options' }, - { property: 'icon' } + { property: 'icon' }, + { property: 'hide' } ]; export function from(this: void, external: IConfigurationProperties & { [key: string]: any }, context: IParseContext, @@ -1350,7 +1356,7 @@ namespace ConfigurationProperties { result.identifier = external.identifier; } result.icon = external.icon; - + result.hide = external.hide; if (external.isBackground !== undefined) { result.isBackground = !!external.isBackground; } @@ -1483,7 +1489,7 @@ namespace ConfiguringTask { type, taskIdentifier, RunOptions.fromConfiguration(external.runOptions), - {} + { hide: external.hide } ); const configuration = ConfigurationProperties.from(external, context, true, source, typeDeclaration.properties); result.addTaskLoadMessages(configuration.errors); @@ -1635,7 +1641,8 @@ namespace CustomTask { { name: configuredProps.configurationProperties.name || contributedTask.configurationProperties.name, identifier: configuredProps.configurationProperties.identifier || contributedTask.configurationProperties.identifier, - icon: configuredProps.configurationProperties.icon + icon: configuredProps.configurationProperties.icon, + hide: configuredProps.configurationProperties.hide }, ); @@ -2119,7 +2126,7 @@ class ConfigurationParser { identifier: name, group: Tasks.TaskGroup.Build, isBackground: isBackground, - problemMatchers: matchers, + problemMatchers: matchers } ); const taskGroupKind = GroupKind.from(fileConfig.group); diff --git a/src/vs/workbench/contrib/tasks/common/tasks.ts b/src/vs/workbench/contrib/tasks/common/tasks.ts index 1b52c33d02abd..7b5f299b9e285 100644 --- a/src/vs/workbench/contrib/tasks/common/tasks.ts +++ b/src/vs/workbench/contrib/tasks/common/tasks.ts @@ -549,6 +549,11 @@ export interface IConfigurationProperties { * The icon for this task in the terminal tabs list */ icon?: { id?: string; color?: string }; + + /** + * Does not show this task in the run task quickpick + */ + hide?: boolean; } export enum RunOnOptions { @@ -914,6 +919,11 @@ export class ContributedTask extends CommonTask { */ icon: { id?: string; color?: string } | undefined; + /** + * Don't show the task in the run task quickpick + */ + hide?: boolean; + public constructor(id: string, source: IExtensionTaskSource, label: string, type: string | undefined, defines: KeyedTaskIdentifier, command: ICommandConfiguration, hasDefinedMatchers: boolean, runOptions: IRunOptions, configurationProperties: IConfigurationProperties) { @@ -922,6 +932,7 @@ export class ContributedTask extends CommonTask { this.hasDefinedMatchers = hasDefinedMatchers; this.command = command; this.icon = configurationProperties.icon; + this.hide = configurationProperties.hide; } public override clone(): ContributedTask { From 97c7211c9365a2c2841b65affde27464726787b2 Mon Sep 17 00:00:00 2001 From: Megan Rogge Date: Tue, 5 Jul 2022 21:34:05 -0400 Subject: [PATCH 03/16] Update .vscode/tasks.json --- .vscode/tasks.json | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 152780208d05b..3872db0d3fa3d 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -1,13 +1,6 @@ { "version": "2.0.0", "tasks": [ - { - "label": "test input", - "type": "shell", - "command": "echo", - "icon": {"id": "account"}, - "hide": true - }, { "type": "npm", "script": "watch-clientd", From 55473933e4f3215d739940ca26d0fa15ae6b1acb Mon Sep 17 00:00:00 2001 From: Megan Rogge Date: Tue, 5 Jul 2022 21:34:25 -0400 Subject: [PATCH 04/16] Update .vscode/tasks.json --- .vscode/tasks.json | 1 - 1 file changed, 1 deletion(-) diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 3872db0d3fa3d..30f0f064ba65c 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -68,7 +68,6 @@ "isDefault": true }, "problemMatcher": [], - "hide": true }, { "type": "npm", From 5731653cb4c1c2464e6e6e7e62fee75993bd2e19 Mon Sep 17 00:00:00 2001 From: Megan Rogge Date: Tue, 5 Jul 2022 21:34:39 -0400 Subject: [PATCH 05/16] Update .vscode/tasks.json --- .vscode/tasks.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 30f0f064ba65c..df0ab245c7d28 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -67,7 +67,7 @@ "kind": "build", "isDefault": true }, - "problemMatcher": [], + "problemMatcher": [] }, { "type": "npm", From 8492ee88f1b9378e39da921ce54f22f11d3bca52 Mon Sep 17 00:00:00 2001 From: Megan Rogge Date: Tue, 5 Jul 2022 21:34:54 -0400 Subject: [PATCH 06/16] Update .vscode/tasks.json --- .vscode/tasks.json | 1 - 1 file changed, 1 deletion(-) diff --git a/.vscode/tasks.json b/.vscode/tasks.json index df0ab245c7d28..03e27bb4f60a7 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -221,7 +221,6 @@ } }, { - "type": "${input:type}", "script": "tsec-compile-check", "problemMatcher": [ { From 572dc4f3068c7246de3d65ce6d4092a2b5f3218f Mon Sep 17 00:00:00 2001 From: Megan Rogge Date: Tue, 5 Jul 2022 21:35:17 -0400 Subject: [PATCH 07/16] Update .vscode/tasks.json --- .vscode/tasks.json | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 03e27bb4f60a7..667da7a509b56 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -233,11 +233,4 @@ "label": "npm: tsec-compile-check", "detail": "node_modules/tsec/bin/tsec -p src/tsconfig.json --noEmit" } - ], - "inputs": [{ - "id": "type", - "options": ["npm", "shell"], - "type": "pickString", - "description": "the type of script to trun" - }] } From bfd17f4416eecf26e816e1e6a815e521f24f8a61 Mon Sep 17 00:00:00 2001 From: Megan Rogge Date: Tue, 5 Jul 2022 21:35:42 -0400 Subject: [PATCH 08/16] Update .vscode/tasks.json --- .vscode/tasks.json | 1 + 1 file changed, 1 insertion(+) diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 667da7a509b56..2634a3d775942 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -233,4 +233,5 @@ "label": "npm: tsec-compile-check", "detail": "node_modules/tsec/bin/tsec -p src/tsconfig.json --noEmit" } +] } From 62ef13b0a90aee6f5dfe89d0f84d8d263eea54cd Mon Sep 17 00:00:00 2001 From: Megan Rogge Date: Tue, 5 Jul 2022 21:36:06 -0400 Subject: [PATCH 09/16] Update .vscode/tasks.json --- .vscode/tasks.json | 1 + 1 file changed, 1 insertion(+) diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 2634a3d775942..a9e8ac00781e4 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -221,6 +221,7 @@ } }, { + "type": "npm", "script": "tsec-compile-check", "problemMatcher": [ { From ce5799819bd2735154e94d20cc5a8019c3642017 Mon Sep 17 00:00:00 2001 From: Megan Rogge Date: Tue, 5 Jul 2022 21:36:36 -0400 Subject: [PATCH 10/16] Update .vscode/tasks.json --- .vscode/tasks.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vscode/tasks.json b/.vscode/tasks.json index a9e8ac00781e4..3f3b5680b7992 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -221,7 +221,7 @@ } }, { - "type": "npm", + "type": "npm", "script": "tsec-compile-check", "problemMatcher": [ { From d55967f0f9d1515bb1d07f05a285029553650623 Mon Sep 17 00:00:00 2001 From: Megan Rogge Date: Tue, 5 Jul 2022 21:37:02 -0400 Subject: [PATCH 11/16] Update .vscode/tasks.json --- .vscode/tasks.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 3f3b5680b7992..71d93da7a556d 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -234,5 +234,5 @@ "label": "npm: tsec-compile-check", "detail": "node_modules/tsec/bin/tsec -p src/tsconfig.json --noEmit" } -] + ] } From 9b65041325f2938778654f9ba9939fc16d086287 Mon Sep 17 00:00:00 2001 From: meganrogge Date: Tue, 5 Jul 2022 21:39:59 -0400 Subject: [PATCH 12/16] revert change --- .vscode/tasks.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 71d93da7a556d..b15f3a96311a9 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -221,7 +221,7 @@ } }, { - "type": "npm", + "type": "npm", "script": "tsec-compile-check", "problemMatcher": [ { @@ -234,5 +234,5 @@ "label": "npm: tsec-compile-check", "detail": "node_modules/tsec/bin/tsec -p src/tsconfig.json --noEmit" } - ] + ] } From 919ee8141bed543c0b6d223140c6f667391b03d9 Mon Sep 17 00:00:00 2001 From: meganrogge Date: Tue, 5 Jul 2022 21:44:18 -0400 Subject: [PATCH 13/16] revert changes to task.json --- .vscode/tasks.json | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/.vscode/tasks.json b/.vscode/tasks.json index b15f3a96311a9..28a2907998efa 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -102,16 +102,6 @@ "group": "build", "problemMatcher": [] }, - { - "label": "Restart VS Code - Build", - "dependsOn": [ - "Kill VS Code - Build", - "VS Code - Build" - ], - "group": "build", - "dependsOrder": "sequence", - "problemMatcher": [] - }, { "type": "npm", "script": "watch-webd", @@ -221,7 +211,7 @@ } }, { - "type": "npm", + "type": "npm", "script": "tsec-compile-check", "problemMatcher": [ { @@ -234,5 +224,5 @@ "label": "npm: tsec-compile-check", "detail": "node_modules/tsec/bin/tsec -p src/tsconfig.json --noEmit" } - ] + ] } From 303766a765bebd38a1afc0a30efb920366ee3823 Mon Sep 17 00:00:00 2001 From: meganrogge Date: Tue, 5 Jul 2022 21:45:30 -0400 Subject: [PATCH 14/16] revert another change --- .vscode/tasks.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 28a2907998efa..885f825cc2efb 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -102,6 +102,16 @@ "group": "build", "problemMatcher": [] }, + { + "label": "Restart VS Code - Build", + "dependsOn": [ + "Kill VS Code - Build", + "VS Code - Build" + ], + "group": "build", + "dependsOrder": "sequence", + "problemMatcher": [] + }, { "type": "npm", "script": "watch-webd", From 3778d6997377fb1e5fab89e63f144a3de4829481 Mon Sep 17 00:00:00 2001 From: Megan Rogge Date: Tue, 5 Jul 2022 21:47:50 -0400 Subject: [PATCH 15/16] Update src/vs/workbench/contrib/tasks/common/tasks.ts --- src/vs/workbench/contrib/tasks/common/tasks.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vs/workbench/contrib/tasks/common/tasks.ts b/src/vs/workbench/contrib/tasks/common/tasks.ts index 7b5f299b9e285..f4956cc9aef7a 100644 --- a/src/vs/workbench/contrib/tasks/common/tasks.ts +++ b/src/vs/workbench/contrib/tasks/common/tasks.ts @@ -551,7 +551,7 @@ export interface IConfigurationProperties { icon?: { id?: string; color?: string }; /** - * Does not show this task in the run task quickpick + * Do not show this task in the run task quickpick */ hide?: boolean; } From f5441711809e89a29a82f1091776ba10cf9cb470 Mon Sep 17 00:00:00 2001 From: meganrogge Date: Wed, 6 Jul 2022 10:56:06 -0400 Subject: [PATCH 16/16] quick pick --- src/vs/workbench/contrib/tasks/common/jsonSchema_v2.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vs/workbench/contrib/tasks/common/jsonSchema_v2.ts b/src/vs/workbench/contrib/tasks/common/jsonSchema_v2.ts index cda3f44b17cea..fa67f8ecf6509 100644 --- a/src/vs/workbench/contrib/tasks/common/jsonSchema_v2.ts +++ b/src/vs/workbench/contrib/tasks/common/jsonSchema_v2.ts @@ -48,7 +48,7 @@ const shellCommand: IJSONSchema = { const hide: IJSONSchema = { type: 'boolean', - description: nls.localize('JsonSchema.hide', 'Hide this task from the run task quickpick'), + description: nls.localize('JsonSchema.hide', 'Hide this task from the run task quick pick'), default: true };