fix: remove outdated copy of text input and external editor feature (#670)
Signed-off-by: Thibault Sottiaux <tibo@openai.com>
This commit is contained in:
committed by
GitHub
parent
15bf5ca971
commit
44d68f9dbf
@@ -107,88 +107,6 @@ export default class TextBuffer {
|
||||
}
|
||||
}
|
||||
|
||||
/* =====================================================================
|
||||
* External editor integration (git‑style $EDITOR workflow)
|
||||
* =================================================================== */
|
||||
|
||||
/**
|
||||
* Opens the current buffer contents in the user’s preferred terminal text
|
||||
* editor ($VISUAL or $EDITOR, falling back to "vi"). The method blocks
|
||||
* until the editor exits, then reloads the file and replaces the in‑memory
|
||||
* buffer with whatever the user saved.
|
||||
*
|
||||
* The operation is treated as a single undoable edit – we snapshot the
|
||||
* previous state *once* before launching the editor so one `undo()` will
|
||||
* revert the entire change set.
|
||||
*
|
||||
* Note: We purposefully rely on the *synchronous* spawn API so that the
|
||||
* calling process genuinely waits for the editor to close before
|
||||
* continuing. This mirrors Git’s behaviour and simplifies downstream
|
||||
* control‑flow (callers can simply `await` the Promise).
|
||||
*/
|
||||
async openInExternalEditor(opts: { editor?: string } = {}): Promise<void> {
|
||||
// Deliberately use `require()` so that unit tests can stub the
|
||||
// respective modules with `vi.spyOn(require("node:child_process"), …)`.
|
||||
// Dynamic `import()` would circumvent those CommonJS stubs.
|
||||
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
||||
const pathMod = require("node:path");
|
||||
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
||||
const fs = require("node:fs");
|
||||
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
||||
const os = require("node:os");
|
||||
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
||||
const { spawnSync } = require("node:child_process");
|
||||
|
||||
const editor =
|
||||
opts.editor ??
|
||||
process.env["VISUAL"] ??
|
||||
process.env["EDITOR"] ??
|
||||
(process.platform === "win32" ? "notepad" : "vi");
|
||||
|
||||
// Prepare a temporary file with the current contents. We use mkdtempSync
|
||||
// to obtain an isolated directory and avoid name collisions.
|
||||
const tmpDir = fs.mkdtempSync(pathMod.join(os.tmpdir(), "codex-edit-"));
|
||||
const filePath = pathMod.join(tmpDir, "buffer.txt");
|
||||
|
||||
fs.writeFileSync(filePath, this.getText(), "utf8");
|
||||
|
||||
// One snapshot for undo semantics *before* we mutate anything.
|
||||
this.pushUndo();
|
||||
|
||||
// The child inherits stdio so the user can interact with the editor as if
|
||||
// they had launched it directly.
|
||||
const { status, error } = spawnSync(editor, [filePath], {
|
||||
stdio: "inherit",
|
||||
});
|
||||
|
||||
if (error) {
|
||||
throw error;
|
||||
}
|
||||
if (typeof status === "number" && status !== 0) {
|
||||
throw new Error(`External editor exited with status ${status}`);
|
||||
}
|
||||
|
||||
// Read the edited contents back in – normalise line endings to \n.
|
||||
let newText = fs.readFileSync(filePath, "utf8");
|
||||
newText = newText.replace(/\r\n?/g, "\n");
|
||||
|
||||
// Update buffer.
|
||||
this.lines = newText.split("\n");
|
||||
if (this.lines.length === 0) {
|
||||
this.lines = [""];
|
||||
}
|
||||
|
||||
// Position the caret at EOF.
|
||||
this.cursorRow = this.lines.length - 1;
|
||||
this.cursorCol = cpLen(this.line(this.cursorRow));
|
||||
|
||||
// Reset scroll offsets so the new end is visible.
|
||||
this.scrollRow = Math.max(0, this.cursorRow - 1);
|
||||
this.scrollCol = 0;
|
||||
|
||||
this.version++;
|
||||
}
|
||||
|
||||
/* =======================================================================
|
||||
* Geometry helpers
|
||||
* ===================================================================== */
|
||||
|
||||
Reference in New Issue
Block a user