microsoft
/
vscode-gradle
зеркало из https://github.com/microsoft/vscode-gradle.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Add feature to run task with custom args

This commit is contained in:
Richard Willis 2019-11-30 17:33:32 +01:00
Родитель 9d3b10135b
Коммит af3249c8d8
4 изменённых файлов: 110 добавлений и 61 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

16
package.json
Просмотреть файл

@ -86,6 +86,10 @@
"dark": "resources/dark/continue.svg"
}
},
{
"command": "gradle.runTaskWithArgs",
"title": "Run Task With Args"
},
{
"command": "gradle.stopTask",
"title": "Stop Task",
@ -104,7 +108,7 @@
},
{
"command": "gradle.explorerFlat",
"title": "Show flat list",
"title": "Show Flat List",
"icon": {
"light": "resources/light/list-flat.svg",
"dark": "resources/dark/list-flat.svg"
@ -112,7 +116,7 @@
},
{
"command": "gradle.explorerTree",
"title": "Show tree",
"title": "Show Tree",
"icon": {
"light": "resources/light/list-tree.svg",
"dark": "resources/dark/list-tree.svg"
@ -129,6 +133,10 @@
"command": "gradle.runTask",
"when": "false"
},
{
"command": "gradle.runTaskWithArgs",
"when": "false"
},
{
"command": "gradle.stopTask",
"when": "false"
@ -164,6 +172,10 @@
"command": "gradle.runTask",
"when": "view == gradle-tree-view && viewItem == task"
},
{
"command": "gradle.runTaskWithArgs",
"when": "view == gradle-tree-view && viewItem == task"
},
{
"command": "gradle.runTask",
"when": "view == gradle-tree-view && viewItem == task",

10
src/extension.ts
Просмотреть файл

@ -95,6 +95,13 @@ function registerCommands(
treeDataProvider
)
);
context.subscriptions.push(
vscode.commands.registerCommand(
'gradle.runTaskWithArgs',
treeDataProvider.runTaskWithArgs,
treeDataProvider
)
);
context.subscriptions.push(
vscode.commands.registerCommand(
'gradle.stopTask',
@ -132,6 +139,7 @@ function registerCommands(
export interface ExtensionApi {
outputChannel: vscode.OutputChannel;
treeDataProvider: GradleTasksTreeDataProvider | undefined;
}
export async function activate(
@ -158,7 +166,7 @@ export async function activate(
);
}
}
return { outputChannel };
return { outputChannel, treeDataProvider };
}
export function deactivate(): void {}

26
src/gradleView.ts
Просмотреть файл

@ -5,7 +5,8 @@ import {
// GradleTaskDefinition,
isWorkspaceFolder,
invalidateTasksCache,
enableTaskDetection
enableTaskDetection,
cloneTask
} from './tasks';
function getTaskExecution(task: vscode.Task) {
@ -146,11 +147,7 @@ class NoTasksTreeItem extends vscode.TreeItem {
export class GradleTasksTreeDataProvider
implements vscode.TreeDataProvider<vscode.TreeItem> {
private taskItemsPromise: Thenable<vscode.Task[]> = Promise.resolve([]);
private taskTree:
| WorkspaceTreeItem[]
// | GradleBuildFileTreeItem[]
| NoTasksTreeItem[]
| null = null;
private taskTree: WorkspaceTreeItem[] | NoTasksTreeItem[] | null = null;
private _onDidChangeTreeData: vscode.EventEmitter<vscode.TreeItem | null> = new vscode.EventEmitter<vscode.TreeItem | null>();
readonly onDidChangeTreeData: vscode.Event<vscode.TreeItem | null> = this
._onDidChangeTreeData.event;
@ -188,6 +185,21 @@ export class GradleTasksTreeDataProvider
}
}
async runTaskWithArgs(taskItem: GradleTaskTreeItem) {
if (taskItem && taskItem.task) {
const args = await vscode.window.showInputBox({
placeHolder: 'For example: --all',
ignoreFocusOut: true
});
if (args !== undefined) {
const task = await cloneTask(taskItem!.task, args.split(' '));
if (task) {
vscode.tasks.executeTask(task);
}
}
}
}
stopTask(taskItem: GradleTaskTreeItem) {
if (taskItem && taskItem.task) {
const execution = getTaskExecution(taskItem.task);
@ -268,7 +280,7 @@ export class GradleTasksTreeDataProvider
private buildTaskTree(
tasks: vscode.Task[]
): WorkspaceTreeItem[] /* | GradleBuildFileTreeItem[]*/ | NoTasksTreeItem[] {
): WorkspaceTreeItem[] | NoTasksTreeItem[] {
const workspaceTreeItems: Map<String, WorkspaceTreeItem> = new Map();
const projectTreeItems: Map<String, ProjectTreeItem> = new Map();
const groupTreeItems: Map<String, GroupTreeItem> = new Map();

119
src/tasks.ts
Просмотреть файл

@ -33,15 +33,15 @@ export interface GradleTaskDefinition extends vscode.TaskDefinition {
let autoDetectOverride: boolean = false;
let cachedTasks: Promise<vscode.Task[]> | undefined;
let refreshProcess: cp.ChildProcessWithoutNullStreams | undefined;
let gradleTasksProcess: cp.ChildProcessWithoutNullStreams | undefined;
export function enableTaskDetection() {
autoDetectOverride = true;
}
export function killRefreshProcess() {
if (refreshProcess) {
refreshProcess.kill();
if (gradleTasksProcess) {
gradleTasksProcess.kill();
}
}
@ -133,23 +133,22 @@ export class GradleTaskProvider implements vscode.TaskProvider {
return emptyTasks;
}
const tasks: vscode.Task[] = [];
for (const gradleProject of gradleProjects) {
for (const gradleTask of gradleProject.tasks) {
tasks.push(
await createTask(
gradleTask,
folder!,
command,
rootProject.name,
vscode.Uri.file(gradleProject.buildFile)
return gradleProjects.reduce(
(allTasks: vscode.Task[], gradleProject: GradleProject) => {
return allTasks.concat(
gradleProject.tasks.map(gradleTask =>
createTaskFromGradleTask(
gradleTask,
folder!,
command,
rootProject.name,
vscode.Uri.file(gradleProject.buildFile)
)
)
);
}
}
return tasks;
},
[]
);
}
private async getProjectsFromGradle(
@ -164,7 +163,7 @@ export class GradleTaskProvider implements vscode.TaskProvider {
const command = getTasksScriptCommand();
const cwd = this.context.asAbsolutePath('lib');
const args = [folder.uri.fsPath, tempFile];
return spawn(command, args, { cwd }, this.outputChannel)
return executeGradleTasksCommand(command, args, { cwd }, this.outputChannel)
.then(() => fs.promises.readFile(tempFile, 'utf8'))
.finally(async () => {
this.statusBarItem.hide();
@ -221,17 +220,39 @@ export function getTasksScriptCommand(): string {
}
}
export async function createTask(
export function createTaskFromDefinition(
definition: vscode.TaskDefinition,
folder: vscode.WorkspaceFolder,
cmd: string,
args: string[] = []
) {
const crossShellCmd = `"${cmd}"`;
const cwd = folder.uri.fsPath;
const allArgs = [definition.script, ...args];
const task = new vscode.Task(
definition,
folder,
definition.script,
'gradle',
new vscode.ShellExecution(crossShellCmd, allArgs, { cwd }),
['$gradle']
);
task.presentationOptions = {
clear: true,
showReuseMessage: false,
focus: true
};
return task;
}
export function createTaskFromGradleTask(
gradleTask: GradleTask,
folder: vscode.WorkspaceFolder,
command: string,
rootProject: string,
buildFile: vscode.Uri
): Promise<vscode.Task> {
function getCommandLine(task: string): string {
return `"${command}" ${task}`;
}
buildFile: vscode.Uri,
shellArgs: string[] = []
): vscode.Task {
const friendlyTaskName = gradleTask.path.replace(/^:/, '');
const definition: GradleTaskDefinition = {
type: 'gradle',
@ -242,22 +263,19 @@ export async function createTask(
buildFile: buildFile.fsPath,
rootProject
};
const cwd = folder.uri.fsPath;
const cmd = getCommandLine(definition.script);
const task = new vscode.Task(
definition,
folder,
definition.script,
'gradle',
new vscode.ShellExecution(cmd, { cwd }),
['$gradle']
);
task.presentationOptions = {
clear: true,
showReuseMessage: false,
focus: true
};
return task;
return createTaskFromDefinition(definition, folder, command, shellArgs);
}
export async function cloneTask(
task: vscode.Task,
args: string[] = []
): Promise<vscode.Task | undefined> {
const folder = task.scope as vscode.WorkspaceFolder;
const command = await getGradleWrapperCommandFromPath(folder.uri.fsPath);
if (!command) {
return undefined;
}
return createTaskFromDefinition(task.definition, folder, command, args);
}
export async function hasGradleProject(): Promise<boolean> {
@ -296,34 +314,33 @@ export function parseGradleProjects(buffer: Buffer | string): GradleProject[] {
function debugCommand(
command: string,
args: ReadonlyArray<string>,
options: cp.SpawnOptionsWithoutStdio,
outputChannel: vscode.OutputChannel
) {
const message = `Executing: ${command} ${args.join(' ')}`;
outputChannel.appendLine(message);
}
export function spawn(
export function executeGradleTasksCommand(
command: string,
args: ReadonlyArray<string> = [],
options: cp.SpawnOptionsWithoutStdio = {},
outputChannel: vscode.OutputChannel
): Promise<string> {
debugCommand(command, args, options, outputChannel);
debugCommand(command, args, outputChannel);
return new Promise((resolve, reject) => {
refreshProcess = cp.spawn(command, args, options);
refreshProcess.stdout.on('data', (buffer: Buffer) =>
gradleTasksProcess = cp.spawn(command, args, options);
gradleTasksProcess.stdout.on('data', (buffer: Buffer) =>
outputChannel.append(buffer.toString())
);
refreshProcess.stderr.on('data', (buffer: Buffer) =>
gradleTasksProcess.stderr.on('data', (buffer: Buffer) =>
outputChannel.append(buffer.toString())
);
refreshProcess.on('error', reject);
refreshProcess.on('exit', (code: number) => {
gradleTasksProcess.on('error', reject);
gradleTasksProcess.on('exit', (code: number) => {
if (code === 0) {
resolve();
} else {
reject();
reject(new Error(`Process exited with code ${code}`));
}
});
});