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.

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

AiderTest command #14

Merged
merged 5 commits into from
Sep 26, 2024
Merged
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
42 changes: 33 additions & 9 deletions denops/aider/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@ export async function main(denops: Denops): Promise<void> {
type ArgCount = "0" | "1" | "*";
type ImplType<T extends ArgCount> = T extends "0" ? (() => Promise<void>)
: T extends "1" ? ((arg: string) => Promise<void>)
: ((arg: string, arg2: string) => Promise<void>); // MEMO: 1つめの引数、2つめの引数という意味
: ((arg: string, arg2: string) => Promise<void>); // MEMO: ArgCountは*だが現状2つのみ対応している
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion

Translate inline comment to English for consistency

The inline comment is in Japanese: // MEMO: ArgCountは*だが現状2つのみ対応している. To maintain consistency and readability for all contributors, please translate code comments to English.

type CompleteType<T extends ArgCount> = T extends "1"
? "file" | "shellcmd" | ""
: "";

type Command = {
methodName: string;
Expand All @@ -34,13 +37,15 @@ export async function main(denops: Denops): Promise<void> {
impl: ImplType<argCount>,
pattern: "[<f-args>]" | "[<line1>, <line2>]" | "[]" = "[]",
range: boolean = false,
complete: CompleteType<argCount> = "",
): Promise<Command> {
const rangePart = range ? "-range " : "";

const commandName = "Aider" + dispatcherMethod.charAt(0).toUpperCase() +
dispatcherMethod.slice(1);
const completePart = complete === "" ? "" : `-complete=${complete}`;
await denops.cmd(
`command! -nargs=${argCount} ${rangePart} ${commandName} call denops#notify("${denops.name}", "${dispatcherMethod}", ${pattern})`,
`command! -nargs=${argCount} ${completePart} ${rangePart} ${commandName} call denops#notify("${denops.name}", "${dispatcherMethod}", ${pattern})`,
);
return {
methodName: dispatcherMethod,
Expand Down Expand Up @@ -84,11 +89,18 @@ export async function main(denops: Denops): Promise<void> {
"sendPromptWithInput",
() => buffer.sendPromptWithInput(denops),
),
await command("addFile", "1", async (path: string) => {
const prompt = `/add ${path}`;
await v.r.set(denops, "q", prompt);
await denops.dispatcher.sendPromptWithInput(path);
}, "[<f-args>]"),
await command(
"addFile",
"1",
async (path: string) => {
const prompt = `/add ${path}`;
await v.r.set(denops, "q", prompt);
await denops.dispatcher.sendPromptWithInput();
},
"[<f-args>]",
false,
"file",
),
await command(
"addCurrentFile",
"0",
Expand All @@ -97,12 +109,12 @@ export async function main(denops: Denops): Promise<void> {
await command("addWeb", "1", async (url: string) => {
const prompt = `/web ${url}`;
await v.r.set(denops, "q", prompt);
Copy link
Collaborator Author

@tsukimizake tsukimizake Sep 26, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

v.r.setしてからsendPromptWithImputするのはコード上に出ない状態ができてしまってつらいのでbuffer.sendPromptWithInput(denops, input) みたいにinputも渡して中でv.r.setする方がよさそう

await denops.dispatcher.sendPromptWithInput(url);
await denops.dispatcher.sendPromptWithInput();
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

denops渡すべきっぽいところにurlとかquestionとか渡していて壊してたかと思いきや動いていて、
mainのsendPromptWithImputは引数を取らないので無視されていたっぽい

}, "[<f-args>]"),
await command("ask", "1", async (question: string) => {
const prompt = `/ask ${question}`;
await v.r.set(denops, "q", prompt);
await denops.dispatcher.sendPromptWithInput(question);
await denops.dispatcher.sendPromptWithInput();
}, "[<f-args>]"),
await command("exit", "0", () => buffer.exitAiderBuffer(denops)),
await command(
Expand Down Expand Up @@ -130,6 +142,18 @@ export async function main(denops: Denops): Promise<void> {
await denops.cmd("close!");
await denops.cmd(`silent! e!`);
}),
await command(
"test",
"1",
async (cmd: string) => {
const prompt = `/test ${cmd}`;
await v.r.set(denops, "q", prompt);
await denops.dispatcher.sendPromptWithInput();
},
"[<f-args>]",
false,
"shellcmd",
Copy link
Collaborator Author

@tsukimizake tsukimizake Sep 26, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

optionalな引数がだいぶ増えてしまったので1つのopts的なオブジェクト引数にまとめるやつを次やるとおもわれます

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

オッスオッス

),
];

denops.dispatcher = Object.fromEntries(commands.map((command) => [
Expand Down