Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 15 additions & 4 deletions src/models/taskDefinition.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import * as vscode from 'vscode';
import { Location, Task } from './models.js';
import { settings } from '../utils/settings.js';
import { useDedicatedTerminal, buildTaskCommand } from '../utils/taskPresentation.js';

export class TaskDefinition implements vscode.TaskDefinition {
private _task: Task;
Expand Down Expand Up @@ -37,17 +38,27 @@ export class TaskDefinition implements vscode.TaskDefinition {
cliArgs = cliArgs?.filter(x => x !== "") || [];
const uri = vscode.Uri.file(this.workspace);
const workspaceFolder = vscode.workspace.getWorkspaceFolder(uri) || vscode.TaskScope.Workspace;
const taskLabel = cliArgs.length > 0 ? `${this.name} ${cliArgs.join(' ')}` : this.name;
const definition: vscode.TaskDefinition = {
type: this.type,
task: this.task,
workspace: this.workspace,
file: this.location.taskfile
};
if (cliArgs.length > 0) {
definition.args = cliArgs;
}
const task = new vscode.Task(
this,
definition,
workspaceFolder,
this.name,
taskLabel,
this.type,
new vscode.ShellExecution(
`${settings.path} ${this.task}${cliArgs && cliArgs.length > 0 ? " -- " + cliArgs.join(' ') : ''}`,
buildTaskCommand(settings.path, this.task, cliArgs),
{cwd: this.workspace}
)
);
task.detail = this.description;
return task;
return useDedicatedTerminal(task);
}
}
25 changes: 17 additions & 8 deletions src/providers/taskProvider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@

import * as vscode from 'vscode';
import { Taskfile } from '../models/taskfile.js';
import { TaskDefinition } from '../models/taskDefinition.js';
import { useDedicatedTerminal, buildTaskCommand } from '../utils/taskPresentation.js';
import { settings } from '../utils/settings.js';

export class TaskProvider implements vscode.TaskProvider<vscode.Task> {
private _taskfiles: Taskfile[] = [];
Expand All @@ -22,16 +23,24 @@ export class TaskProvider implements vscode.TaskProvider<vscode.Task> {
}

public resolveTask(_task: vscode.Task): vscode.Task | undefined {
const task = _task.definition.task;
if (task) {
const definition: TaskDefinition = <any>_task.definition;
return new vscode.Task(
const taskName = _task.definition.task;
if (taskName) {
const definition = _task.definition;
const cliArgs = Array.isArray(definition.args)
? definition.args.filter((arg: unknown): arg is string => typeof arg === 'string' && arg !== "")
: [];
const workspace = typeof definition.workspace === 'string' ? definition.workspace : undefined;
const executionOptions = workspace ? {cwd: workspace} : undefined;
return useDedicatedTerminal(new vscode.Task(
definition,
_task.scope ?? vscode.TaskScope.Workspace,
definition.task,
taskName,
'taskfile',
new vscode.ShellExecution(`task ${definition.task}`)
);
new vscode.ShellExecution(
buildTaskCommand(settings.path, taskName, cliArgs),
executionOptions
)
), _task.presentationOptions);
}
return undefined;
}
Expand Down
19 changes: 19 additions & 0 deletions src/utils/taskPresentation.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import * as vscode from 'vscode';

const dedicatedTerminalDefaults: vscode.TaskPresentationOptions = {
panel: vscode.TaskPanelKind.Dedicated,
reveal: vscode.TaskRevealKind.Always,
clear: false,
showReuseMessage: false
};

// Applies our dedicated-terminal presentation defaults, while letting any
// user-supplied options (e.g. from tasks.json) take precedence.
export function useDedicatedTerminal(task: vscode.Task, overrides?: vscode.TaskPresentationOptions): vscode.Task {
task.presentationOptions = { ...dedicatedTerminalDefaults, ...overrides };
return task;
}

export function buildTaskCommand(taskBin: string, taskName: string, cliArgs: string[]): string {
return `${taskBin} ${taskName}${cliArgs.length > 0 ? " -- " + cliArgs.join(' ') : ''}`;
}