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

task part of #211878 #211973

Merged
merged 6 commits into from
May 7, 2024
Merged

task part of #211878 #211973

Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
18e1fef
task part of #211878
meganrogge May 3, 2024
f0158ee
Update build/builtin/.eslintrc
meganrogge May 3, 2024
7d76f27
Update build/builtin/.eslintrc
meganrogge May 3, 2024
caaf3fe
revert change
meganrogge May 3, 2024
a22a9f3
Merge branch 'main' into merogge/type-assertions
meganrogge May 7, 2024
179967e
write object directly
meganrogge May 7, 2024
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
27 changes: 11 additions & 16 deletions src/vs/workbench/contrib/tasks/common/taskConfiguration.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1003,8 +1003,7 @@ namespace CommandConfiguration {
runtime = Tasks.RuntimeType.fromString(config.type);
}
}
const isShellConfiguration = ShellConfiguration.is(config.isShellCommand);
if (Types.isBoolean(config.isShellCommand) || isShellConfiguration) {
if (Types.isBoolean(config.isShellCommand) || ShellConfiguration.is(config.isShellCommand)) {
runtime = Tasks.RuntimeType.Shell;
} else if (config.isShellCommand !== undefined) {
runtime = !!config.isShellCommand ? Tasks.RuntimeType.Shell : Tasks.RuntimeType.Process;
Expand Down Expand Up @@ -1034,8 +1033,8 @@ namespace CommandConfiguration {
}
if (config.options !== undefined) {
result.options = CommandOptions.from(config.options, context);
if (result.options && result.options.shell === undefined && isShellConfiguration) {
result.options.shell = ShellConfiguration.from(config.isShellCommand as IShellConfiguration, context);
if (result.options && result.options.shell === undefined && ShellConfiguration.is(config.isShellCommand)) {
result.options.shell = ShellConfiguration.from(config.isShellCommand, context);
if (context.engine !== Tasks.ExecutionEngine.Terminal) {
context.taskLoadIssues.push(nls.localize('ConfigurationParser.noShell', 'Warning: shell configuration is only supported when executing tasks in the terminal.'));
}
Expand Down Expand Up @@ -1247,11 +1246,6 @@ export namespace ProblemMatcherConverter {
}
}

const partialSource: Partial<Tasks.TaskSource> = {
label: 'Workspace',
config: undefined
};

export namespace GroupKind {
export function from(this: void, external: string | IGroupKind | undefined): Tasks.TaskGroup | undefined {
if (external === undefined) {
Expand Down Expand Up @@ -1399,6 +1393,7 @@ namespace ConfigurationProperties {
return _isEmpty(value, properties);
}
}
const label = 'Workspace';

namespace ConfiguringTask {

Expand Down Expand Up @@ -1470,15 +1465,15 @@ namespace ConfiguringTask {
let taskSource: Tasks.FileBasedTaskSource;
switch (source) {
case TaskConfigSource.User: {
taskSource = Object.assign({} as Tasks.IUserTaskSource, partialSource, { kind: Tasks.TaskSourceKind.User, config: configElement });
taskSource = Object.assign({}, { kind: Tasks.TaskSourceKind.User, config: configElement, label }) satisfies Tasks.IUserTaskSource;
meganrogge marked this conversation as resolved.
Show resolved Hide resolved
break;
}
case TaskConfigSource.WorkspaceFile: {
taskSource = Object.assign({} as Tasks.WorkspaceFileTaskSource, partialSource, { kind: Tasks.TaskSourceKind.WorkspaceFile, config: configElement });
taskSource = Object.assign({}, { kind: Tasks.TaskSourceKind.WorkspaceFile, config: configElement, label }) satisfies Tasks.WorkspaceFileTaskSource;
break;
}
default: {
taskSource = Object.assign({} as Tasks.IWorkspaceTaskSource, partialSource, { kind: Tasks.TaskSourceKind.Workspace, config: configElement });
taskSource = Object.assign({}, { kind: Tasks.TaskSourceKind.Workspace, config: configElement, label }) satisfies Tasks.IWorkspaceTaskSource;
break;
}
}
Expand Down Expand Up @@ -1543,15 +1538,15 @@ namespace CustomTask {
let taskSource: Tasks.FileBasedTaskSource;
switch (source) {
case TaskConfigSource.User: {
taskSource = Object.assign({} as Tasks.IUserTaskSource, partialSource, { kind: Tasks.TaskSourceKind.User, config: { index, element: external, file: '.vscode/tasks.json', workspaceFolder: context.workspaceFolder } });
taskSource = Object.assign({}, { kind: Tasks.TaskSourceKind.User, config: { index, element: external, file: '.vscode/tasks.json', workspaceFolder: context.workspaceFolder }, label }) satisfies Tasks.IUserTaskSource;
break;
}
case TaskConfigSource.WorkspaceFile: {
taskSource = Object.assign({} as Tasks.WorkspaceFileTaskSource, partialSource, { kind: Tasks.TaskSourceKind.WorkspaceFile, config: { index, element: external, file: '.vscode/tasks.json', workspaceFolder: context.workspaceFolder, workspace: context.workspace } });
taskSource = Object.assign({}, { kind: Tasks.TaskSourceKind.WorkspaceFile, config: { index, element: external, file: '.vscode/tasks.json', workspaceFolder: context.workspaceFolder, workspace: context.workspace }, label }) satisfies Tasks.WorkspaceFileTaskSource;
break;
}
default: {
taskSource = Object.assign({} as Tasks.IWorkspaceTaskSource, partialSource, { kind: Tasks.TaskSourceKind.Workspace, config: { index, element: external, file: '.vscode/tasks.json', workspaceFolder: context.workspaceFolder } });
taskSource = Object.assign({}, { kind: Tasks.TaskSourceKind.Workspace, config: { index, element: external, file: '.vscode/tasks.json', workspaceFolder: context.workspaceFolder }, label }) satisfies Tasks.IWorkspaceTaskSource;
break;
}
}
Expand Down Expand Up @@ -2110,7 +2105,7 @@ class ConfigurationParser {
const name = Tasks.CommandString.value(globals.command.name);
const task: Tasks.CustomTask = new Tasks.CustomTask(
context.uuidMap.getUUID(name),
Object.assign({} as Tasks.IWorkspaceTaskSource, source, { config: { index: -1, element: fileConfig, workspaceFolder: context.workspaceFolder } }),
Object.assign({}, source, 'workspace', { config: { index: -1, element: fileConfig, workspaceFolder: context.workspaceFolder } }) satisfies Tasks.IWorkspaceTaskSource,
name,
Tasks.CUSTOMIZED_TASK_TYPE,
{
Expand Down