Add basic task support
This adds basic support for running `cargo build`, `cargo run`, etc.
This commit is contained in:
parent
671926ac93
commit
768aa4259f
@ -30,15 +30,14 @@ export function configToServerOptions(config: Config) {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function createClient(config: Config, serverPath: string): Promise<lc.LanguageClient> {
|
export async function createClient(config: Config, serverPath: string, workspaceFolder: vscode.WorkspaceFolder | null): Promise<lc.LanguageClient> {
|
||||||
// '.' Is the fallback if no folder is open
|
// '.' Is the fallback if no folder is open
|
||||||
// TODO?: Workspace folders support Uri's (eg: file://test.txt).
|
// TODO?: Workspace folders support Uri's (eg: file://test.txt).
|
||||||
// It might be a good idea to test if the uri points to a file.
|
// It might be a good idea to test if the uri points to a file.
|
||||||
const workspaceFolderPath = vscode.workspace.workspaceFolders?.[0]?.uri.fsPath ?? '.';
|
|
||||||
|
|
||||||
const run: lc.Executable = {
|
const run: lc.Executable = {
|
||||||
command: serverPath,
|
command: serverPath,
|
||||||
options: { cwd: workspaceFolderPath },
|
options: { cwd: workspaceFolder?.uri.fsPath ?? '.' },
|
||||||
};
|
};
|
||||||
const serverOptions: lc.ServerOptions = {
|
const serverOptions: lc.ServerOptions = {
|
||||||
run,
|
run,
|
||||||
|
@ -15,8 +15,13 @@ export class Ctx {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static async create(config: Config, extCtx: vscode.ExtensionContext, serverPath: string): Promise<Ctx> {
|
static async create(
|
||||||
const client = await createClient(config, serverPath);
|
config: Config,
|
||||||
|
extCtx: vscode.ExtensionContext,
|
||||||
|
serverPath: string,
|
||||||
|
workspaceFolder: vscode.WorkspaceFolder | null,
|
||||||
|
): Promise<Ctx> {
|
||||||
|
const client = await createClient(config, serverPath, workspaceFolder);
|
||||||
const res = new Ctx(config, extCtx, client, serverPath);
|
const res = new Ctx(config, extCtx, client, serverPath);
|
||||||
res.pushCleanup(client.start());
|
res.pushCleanup(client.start());
|
||||||
await client.onReady();
|
await client.onReady();
|
||||||
|
@ -13,6 +13,7 @@ import { log, assert } from './util';
|
|||||||
import { PersistentState } from './persistent_state';
|
import { PersistentState } from './persistent_state';
|
||||||
import { fetchRelease, download } from './net';
|
import { fetchRelease, download } from './net';
|
||||||
import { spawnSync } from 'child_process';
|
import { spawnSync } from 'child_process';
|
||||||
|
import { activateTaskProvider } from './tasks';
|
||||||
|
|
||||||
let ctx: Ctx | undefined;
|
let ctx: Ctx | undefined;
|
||||||
|
|
||||||
@ -41,11 +42,13 @@ export async function activate(context: vscode.ExtensionContext) {
|
|||||||
const state = new PersistentState(context.globalState);
|
const state = new PersistentState(context.globalState);
|
||||||
const serverPath = await bootstrap(config, state);
|
const serverPath = await bootstrap(config, state);
|
||||||
|
|
||||||
|
const workspaceFolder = vscode.workspace.workspaceFolders?.[0] ?? null;
|
||||||
|
|
||||||
// Note: we try to start the server before we activate type hints so that it
|
// Note: we try to start the server before we activate type hints so that it
|
||||||
// registers its `onDidChangeDocument` handler before us.
|
// registers its `onDidChangeDocument` handler before us.
|
||||||
//
|
//
|
||||||
// This a horribly, horribly wrong way to deal with this problem.
|
// This a horribly, horribly wrong way to deal with this problem.
|
||||||
ctx = await Ctx.create(config, context, serverPath);
|
ctx = await Ctx.create(config, context, serverPath, workspaceFolder);
|
||||||
|
|
||||||
// Commands which invokes manually via command palette, shortcut, etc.
|
// Commands which invokes manually via command palette, shortcut, etc.
|
||||||
|
|
||||||
@ -85,6 +88,10 @@ export async function activate(context: vscode.ExtensionContext) {
|
|||||||
ctx.registerCommand('applySourceChange', commands.applySourceChange);
|
ctx.registerCommand('applySourceChange', commands.applySourceChange);
|
||||||
ctx.registerCommand('selectAndApplySourceChange', commands.selectAndApplySourceChange);
|
ctx.registerCommand('selectAndApplySourceChange', commands.selectAndApplySourceChange);
|
||||||
|
|
||||||
|
if (workspaceFolder !== null) {
|
||||||
|
ctx.pushCleanup(activateTaskProvider(workspaceFolder));
|
||||||
|
}
|
||||||
|
|
||||||
activateStatusDisplay(ctx);
|
activateStatusDisplay(ctx);
|
||||||
|
|
||||||
if (!ctx.config.highlightingSemanticTokens) {
|
if (!ctx.config.highlightingSemanticTokens) {
|
||||||
|
60
editors/code/src/tasks.ts
Normal file
60
editors/code/src/tasks.ts
Normal file
@ -0,0 +1,60 @@
|
|||||||
|
import {
|
||||||
|
Disposable,
|
||||||
|
ShellExecution,
|
||||||
|
Task,
|
||||||
|
TaskGroup,
|
||||||
|
TaskProvider,
|
||||||
|
tasks,
|
||||||
|
WorkspaceFolder,
|
||||||
|
} from 'vscode';
|
||||||
|
|
||||||
|
// This ends up as the `type` key in tasks.json. RLS also uses `cargo` and
|
||||||
|
// our configuration should be compatible with it so use the same key.
|
||||||
|
const TASK_TYPE = 'cargo';
|
||||||
|
|
||||||
|
export function activateTaskProvider(target: WorkspaceFolder): Disposable {
|
||||||
|
const provider: TaskProvider = {
|
||||||
|
// Detect Rust tasks. Currently we do not do any actual detection
|
||||||
|
// of tasks (e.g. aliases in .cargo/config) and just return a fixed
|
||||||
|
// set of tasks that always exist. These tasks cannot be removed in
|
||||||
|
// tasks.json - only tweaked.
|
||||||
|
provideTasks: () => getStandardCargoTasks(target),
|
||||||
|
|
||||||
|
// We don't need to implement this.
|
||||||
|
resolveTask: () => undefined,
|
||||||
|
};
|
||||||
|
|
||||||
|
return tasks.registerTaskProvider(TASK_TYPE, provider);
|
||||||
|
}
|
||||||
|
|
||||||
|
function getStandardCargoTasks(target: WorkspaceFolder): Task[] {
|
||||||
|
return [
|
||||||
|
{ command: 'build', group: TaskGroup.Build },
|
||||||
|
{ command: 'check', group: TaskGroup.Build },
|
||||||
|
{ command: 'test', group: TaskGroup.Test },
|
||||||
|
{ command: 'clean', group: TaskGroup.Clean },
|
||||||
|
{ command: 'run', group: undefined },
|
||||||
|
]
|
||||||
|
.map(({ command, group }) => {
|
||||||
|
const vscodeTask = new Task(
|
||||||
|
// The contents of this object end up in the tasks.json entries.
|
||||||
|
{
|
||||||
|
type: TASK_TYPE,
|
||||||
|
command,
|
||||||
|
},
|
||||||
|
// The scope of the task - workspace or specific folder (global
|
||||||
|
// is not supported).
|
||||||
|
target,
|
||||||
|
// The task name, and task source. These are shown in the UI as
|
||||||
|
// `${source}: ${name}`, e.g. `rust: cargo build`.
|
||||||
|
`cargo ${command}`,
|
||||||
|
'rust',
|
||||||
|
// What to do when this command is executed.
|
||||||
|
new ShellExecution('cargo', [command]),
|
||||||
|
// Problem matchers.
|
||||||
|
['$rustc'],
|
||||||
|
);
|
||||||
|
vscodeTask.group = group;
|
||||||
|
return vscodeTask;
|
||||||
|
});
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user