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

Correct task provider usages #127

Merged
merged 3 commits into from Sep 18, 2019
Merged

Correct task provider usages #127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7a5bd73
Fix tasks errors.
Sep 17, 2019
454bfc1
remove extra target.
Sep 17, 2019
67299b3
register each task providers by correct type.
Sep 17, 2019
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
16 changes: 15 additions & 1 deletion package.json
View file
Open in desktop
Expand Up @@ -223,7 +223,7 @@
},
"problemMatchers": [
{
"name": "$catkin-gcc",
"name": "catkin-gcc",
"fileLocation": "absolute",
"owner": "catkin",
"pattern": {
Expand All @@ -235,6 +235,20 @@
"message": 5
}
}
],
"taskDefinitions": [
{
"type": "catkin_make"
},
{
"type": "catkin_make_isolated"
},
{
"type": "catkin"
},
{
"type": "colcon"
}
]
},
"scripts": {
Expand Down
21 changes: 12 additions & 9 deletions src/build-tool/build-tool.ts
View file
Open in desktop
Expand Up @@ -13,7 +13,7 @@ import * as colcon from "./colcon";

export abstract class BuildTool {
public static current: BuildTool;
public static registerTaskProvider(): vscode.Disposable {
public static registerTaskProvider(): vscode.Disposable[] {
return this.current._registerTaskProvider();
}

Expand All @@ -23,13 +23,13 @@ export abstract class BuildTool {
return this.current._createPackage();
}

protected abstract _registerTaskProvider(): vscode.Disposable;
protected abstract _registerTaskProvider(): vscode.Disposable[];
protected abstract async _createPackage(): Promise<void>;
}

// tslint:disable-next-line: max-classes-per-file
class NotImplementedBuildTool extends BuildTool {
protected _registerTaskProvider(): vscode.Disposable {
protected _registerTaskProvider(): vscode.Disposable[] {
return null;
}

Expand All @@ -44,8 +44,11 @@ class CatkinCmakeBuildTool extends BuildTool {
return pfs.exists(`${dir}/.catkin_workspace`);
}

protected _registerTaskProvider(): vscode.Disposable {
return vscode.workspace.registerTaskProvider("catkin_cmake", new catkin.CatkinProvider());
protected _registerTaskProvider(): vscode.Disposable[] {
return [
vscode.tasks.registerTaskProvider("catkin_cmake", new catkin.CatkinMakeProvider()),
vscode.tasks.registerTaskProvider("catkin_cmake_isolated", new catkin.CatkinMakeIsolatedProvider()),
];
}

protected async _createPackage(): Promise<void> {
Expand All @@ -59,8 +62,8 @@ class CatkinToolsBuildTool extends BuildTool {
return pfs.exists(`${dir}/.catkin_tools`);
}

protected _registerTaskProvider(): vscode.Disposable {
return vscode.workspace.registerTaskProvider("catkin_tools", new catkin_tools.CatkinToolsProvider());
protected _registerTaskProvider(): vscode.Disposable[] {
return [vscode.tasks.registerTaskProvider("catkin", new catkin_tools.CatkinToolsProvider())];
}

protected async _createPackage(): Promise<void> {
Expand All @@ -74,8 +77,8 @@ class ColconBuildTool extends BuildTool {
return colcon.isApplicable(dir);
}

protected _registerTaskProvider(): vscode.Disposable {
return vscode.workspace.registerTaskProvider("colcon", new colcon.ColconProvider());
protected _registerTaskProvider(): vscode.Disposable[] {
return [vscode.tasks.registerTaskProvider("colcon", new colcon.ColconProvider())];
}

protected async _createPackage(): Promise<void> {
Expand Down
2 changes: 1 addition & 1 deletion src/build-tool/catkin-tools.ts
View file
Open in desktop
Expand Up @@ -24,7 +24,7 @@ export class CatkinToolsProvider implements vscode.TaskProvider {
make.group = vscode.TaskGroup.Build;
make.problemMatchers = ["$catkin-gcc"];

const test = new vscode.Task({ type: "catkin", target: "run_tests" }, "run_tests", "catkin");
const test = new vscode.Task({ type: "catkin" }, "run_tests", "catkin");
test.execution = new vscode.ShellExecution(testCommand, {
env: extension.env,
});
Expand Down
27 changes: 18 additions & 9 deletions src/build-tool/catkin.ts
View file
Open in desktop
Expand Up @@ -7,14 +7,12 @@ import * as extension from "../extension";
import * as common from "./common";

/**
* Provides catkin build and test tasks
* including catkin_make and catkin_make_isolated
* Provides catkin_make build and test tasks
*/
export class CatkinProvider implements vscode.TaskProvider {
export class CatkinMakeProvider implements vscode.TaskProvider {
public provideTasks(token?: vscode.CancellationToken): vscode.ProviderResult<vscode.Task[]> {
const tasksCatkinMake = this.provideCatkinMakeTasks();
const tasksCatkinMakeIsolated = this.provideCatkinMakeIsolatedTasks();
return [...tasksCatkinMake, ...tasksCatkinMakeIsolated];
return [...tasksCatkinMake];
}

public resolveTask(task: vscode.Task, token?: vscode.CancellationToken): vscode.ProviderResult<vscode.Task> {
Expand All @@ -24,7 +22,6 @@ export class CatkinProvider implements vscode.TaskProvider {
private provideCatkinMakeTasks(): vscode.Task[] {
const catkinMakeDefinition: vscode.TaskDefinition = {
type: "catkin_make",
target: "build",
};
const make = new vscode.Task(catkinMakeDefinition, "build", "catkin_make");
const buildCommand = `catkin_make --directory "${extension.baseDir}"`;
Expand All @@ -36,7 +33,6 @@ export class CatkinProvider implements vscode.TaskProvider {

const catkinMakeRunTestsDefinition: vscode.TaskDefinition = {
type: "catkin_make",
target: "run_tests",
};
const test = new vscode.Task(catkinMakeRunTestsDefinition, "run_tests", "catkin_make");
const testCommand = `${buildCommand} run_tests`;
Expand All @@ -47,11 +43,25 @@ export class CatkinProvider implements vscode.TaskProvider {

return [make, test];
}
}

/**
* Provides catkin_make_isolated build and test tasks
*/
// tslint:disable-next-line: max-classes-per-file
export class CatkinMakeIsolatedProvider implements vscode.TaskProvider {
public provideTasks(token?: vscode.CancellationToken): vscode.ProviderResult<vscode.Task[]> {
const tasksCatkinMakeIsolated = this.provideCatkinMakeIsolatedTasks();
return [...tasksCatkinMakeIsolated];
}

public resolveTask(task: vscode.Task, token?: vscode.CancellationToken): vscode.ProviderResult<vscode.Task> {
return undefined;
}

private provideCatkinMakeIsolatedTasks(): vscode.Task[] {
const catkinMakeIsolatedDefinition: vscode.TaskDefinition = {
type: "catkin_make_isolated",
target: "build",
};
const make = new vscode.Task(catkinMakeIsolatedDefinition, "build", "catkin_make_isolated");
const buildCommand = `catkin_make_isolated --directory "${extension.baseDir}"`;
Expand All @@ -63,7 +73,6 @@ export class CatkinProvider implements vscode.TaskProvider {

const catkinMakeIsolatedRunTestsDefinition: vscode.TaskDefinition = {
type: "catkin_make_isolated",
target: "run_tests",
};
const test = new vscode.Task(catkinMakeIsolatedRunTestsDefinition, "run_tests", "catkin_make_isolated");
const testCommand = `${buildCommand} --catkin-make-args run_tests`;
Expand Down
2 changes: 1 addition & 1 deletion src/extension.ts
View file
Open in desktop
Expand Up @@ -142,7 +142,7 @@ function activateEnvironment(context: vscode.ExtensionContext) {
rosApi.setContext(context, env);

subscriptions.push(rosApi.activateCoreMonitor());
subscriptions.push(buildtool.BuildTool.registerTaskProvider());
subscriptions.push(...buildtool.BuildTool.registerTaskProvider());

debug_manager.registerRosDebugManager(context);

Expand Down