Skip to content

Commit 6e53591

Browse files
TimmmmTim Hutt
authored andcommitted
Use namespace import
1 parent 768aa42 commit 6e53591

File tree

1 file changed

+11
-19
lines changed

1 file changed

+11
-19
lines changed

editors/code/src/tasks.ts

Lines changed: 11 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,11 @@
1-
import {
2-
Disposable,
3-
ShellExecution,
4-
Task,
5-
TaskGroup,
6-
TaskProvider,
7-
tasks,
8-
WorkspaceFolder,
9-
} from 'vscode';
1+
import * as vscode from 'vscode';
102

113
// This ends up as the `type` key in tasks.json. RLS also uses `cargo` and
124
// our configuration should be compatible with it so use the same key.
135
const TASK_TYPE = 'cargo';
146

15-
export function activateTaskProvider(target: WorkspaceFolder): Disposable {
16-
const provider: TaskProvider = {
7+
export function activateTaskProvider(target: vscode.WorkspaceFolder): vscode.Disposable {
8+
const provider: vscode.TaskProvider = {
179
// Detect Rust tasks. Currently we do not do any actual detection
1810
// of tasks (e.g. aliases in .cargo/config) and just return a fixed
1911
// set of tasks that always exist. These tasks cannot be removed in
@@ -24,19 +16,19 @@ export function activateTaskProvider(target: WorkspaceFolder): Disposable {
2416
resolveTask: () => undefined,
2517
};
2618

27-
return tasks.registerTaskProvider(TASK_TYPE, provider);
19+
return vscode.tasks.registerTaskProvider(TASK_TYPE, provider);
2820
}
2921

30-
function getStandardCargoTasks(target: WorkspaceFolder): Task[] {
22+
function getStandardCargoTasks(target: vscode.WorkspaceFolder): vscode.Task[] {
3123
return [
32-
{ command: 'build', group: TaskGroup.Build },
33-
{ command: 'check', group: TaskGroup.Build },
34-
{ command: 'test', group: TaskGroup.Test },
35-
{ command: 'clean', group: TaskGroup.Clean },
24+
{ command: 'build', group: vscode.TaskGroup.Build },
25+
{ command: 'check', group: vscode.TaskGroup.Build },
26+
{ command: 'test', group: vscode.TaskGroup.Test },
27+
{ command: 'clean', group: vscode.TaskGroup.Clean },
3628
{ command: 'run', group: undefined },
3729
]
3830
.map(({ command, group }) => {
39-
const vscodeTask = new Task(
31+
const vscodeTask = new vscode.Task(
4032
// The contents of this object end up in the tasks.json entries.
4133
{
4234
type: TASK_TYPE,
@@ -50,7 +42,7 @@ function getStandardCargoTasks(target: WorkspaceFolder): Task[] {
5042
`cargo ${command}`,
5143
'rust',
5244
// What to do when this command is executed.
53-
new ShellExecution('cargo', [command]),
45+
new vscode.ShellExecution('cargo', [command]),
5446
// Problem matchers.
5547
['$rustc'],
5648
);

0 commit comments

Comments
 (0)