From 0c7e4010e6d11dc5bf4acc1831052e908f408430 Mon Sep 17 00:00:00 2001 From: Corwin Marsh Date: Tue, 26 May 2026 11:01:28 -0700 Subject: [PATCH 1/2] docs: fix vim keymaps setting name --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 88f23ca..76892be 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,7 @@ To open oil.code: If you're using vscode-neovim and want to customize the keymaps for oil.code: -1. Set `oil-code.disableDefaultKeymaps` to `true` in your VSCode settings +1. Set `oil-code.disableVimKeymaps` to `true` in your VSCode settings 2. Add the following to your `init.lua` and customize as you like: ```lua @@ -75,7 +75,7 @@ end If you're using VSCodeVim and want to customize the keymaps for oil.code: -1. Set `oil-code.disableDefaultKeymaps` to `true` in your VSCode settings +1. Set `oil-code.disableVimKeymaps` to `true` in your VSCode settings 2. Add the following to your `settings.json` and customize as you like: ```json From e84edfc09fb55099932afb90c51f07c8d472f5f1 Mon Sep 17 00:00:00 2001 From: Corwin Marsh Date: Tue, 26 May 2026 11:26:31 -0700 Subject: [PATCH 2/2] test: stabilize move tests on current vscode --- .github/workflows/main.yml | 2 +- src/test/extension.test.ts | 23 ++++++++++++++++++----- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3b68369..e8b3ba2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -27,7 +27,7 @@ jobs: node-version: 22.x - name: Install pnpm uses: pnpm/action-setup@v4 - - run: pnpm install + - run: pnpm install --frozen-lockfile - run: xvfb-run -a pnpm test if: runner.os == 'Linux' - run: pnpm test diff --git a/src/test/extension.test.ts b/src/test/extension.test.ts index d95308e..5052c84 100644 --- a/src/test/extension.test.ts +++ b/src/test/extension.test.ts @@ -70,6 +70,19 @@ async function insertIntoDocument( assert.ok(applied, "Workspace edit was not applied"); } +async function deleteDocumentLine(document: vscode.TextDocument, line: number) { + const workspaceEdit = new vscode.WorkspaceEdit(); + const range = line === document.lineCount - 1 && line > 0 + ? new vscode.Range( + document.lineAt(line - 1).range.end, + document.lineAt(line).range.end + ) + : document.lineAt(line).rangeIncludingLineBreak; + workspaceEdit.delete(document.uri, range); + const applied = await vscode.workspace.applyEdit(workspaceEdit); + assert.ok(applied, "Workspace edit was not applied"); +} + async function saveDocument(document: vscode.TextDocument) { await sleep(200); await document.save(); @@ -403,8 +416,8 @@ suite("oil.code", () => { assert.ok(editor2, "No active editor2"); editor2.selection = new vscode.Selection(position, position); - // Cut selection - await vscode.commands.executeCommand("editor.action.deleteLines"); + // Remove the source entry before recreating it under the destination. + await deleteDocumentLine(editor2.document, 2); await waitForDocumentText(["/000 ../", "/001 sub-dir/"]); // Move cursor to the new directory @@ -477,7 +490,7 @@ suite("oil.code", () => { // Move cursor to the file name editor2.selection = new vscode.Selection(2, 5, 2, 5); - await vscode.commands.executeCommand("editor.action.deleteLines"); + await deleteDocumentLine(editor2.document, 2); await waitForDocumentText(["/000 ../", "/001 sub-dir/"]); // Move cursor to the new directory @@ -522,7 +535,7 @@ suite("oil.code", () => { ]); editor.selection = new vscode.Selection(1, 5, 1, 5); - await vscode.commands.executeCommand("editor.action.deleteLines"); + await deleteDocumentLine(editor.document, 1); await waitForDocumentText(["/000 ../", "/002 oil-dir-parent/"]); editor.selection = new vscode.Selection(1, 5, 1, 5); await vscode.commands.executeCommand("oil-code.select"); @@ -569,7 +582,7 @@ suite("oil.code", () => { ]); editor.selection = new vscode.Selection(1, 5, 1, 5); - await vscode.commands.executeCommand("editor.action.deleteLines"); + await deleteDocumentLine(editor.document, 1); await waitForDocumentText(["/000 ../", "/002 oil-dir-parent/"]); editor.selection = new vscode.Selection(1, 5, 1, 5); await vscode.commands.executeCommand("oil-code.select");