terminal: handle fresh_line_new_prompt

This commit is contained in:
Mitchell Hashimoto
2026-01-24 13:14:40 -08:00
parent 24bf642bdc
commit 3fa6320478
3 changed files with 41 additions and 17 deletions

View File

@@ -1076,7 +1076,17 @@ pub fn semanticPrompt(
// "Subsequent text (until a OSC "133;B" or OSC "133;I" command)
// is a prompt string (as if followed by OSC 133;P;k=i\007)."
// TODO
// Implementation note: we don't yet differentiate between
// the prompt types (k=) because it isn't of value to us
// currently. This may change in the future.
self.screens.active.cursor.semantic_content = .prompt;
// This is a kitty-specific flag that notes that the shell
// is capable of redraw.
if (cmd.readOption(.redraw)) |v| {
self.flags.shell_redraws_prompt = v;
}
// The "aid" and "cl" options are also valid for this
// command but we don't yet handle these in any meaningful way.

View File

@@ -47,6 +47,7 @@ pub const Option = enum {
cl,
prompt_kind,
err,
// https://sw.kovidgoyal.net/kitty/shell-integration/#notes-for-shell-developers
// Kitty supports a "redraw" option for prompt_start. I can't find
// this documented anywhere but can see in the code that this is used

View File

@@ -216,21 +216,6 @@ pub const Handler = struct {
try self.terminal.semanticPrompt(cmd);
switch (cmd.action) {
.fresh_line_new_prompt => {
const kind = cmd.readOption(.prompt_kind) orelse .initial;
switch (kind) {
.initial, .right => {
self.terminal.screens.active.cursor.page_row.semantic_prompt = .prompt;
if (cmd.readOption(.redraw)) |redraw| {
self.terminal.flags.shell_redraws_prompt = redraw;
}
},
.continuation, .secondary => {
self.terminal.screens.active.cursor.page_row.semantic_prompt = .prompt_continuation;
},
}
},
.end_prompt_start_input => self.terminal.markSemanticPrompt(.input),
.end_input_start_output => self.terminal.markSemanticPrompt(.command),
.end_command => self.terminal.screens.active.cursor.page_row.semantic_prompt = .input,
@@ -240,10 +225,14 @@ pub const Handler = struct {
// handling so we just ignore these like we did before, even
// though we should handle them eventually.
.end_prompt_start_input_terminate_eol,
.fresh_line,
.new_command,
.prompt_start,
=> {},
// Handled by the new action above
.fresh_line,
.fresh_line_new_prompt,
=> {},
}
}
@@ -920,3 +909,27 @@ test "semantic prompt fresh line" {
try testing.expectEqual(@as(usize, 0), t.screens.active.cursor.x);
try testing.expectEqual(@as(usize, 1), t.screens.active.cursor.y);
}
test "semantic prompt fresh line new prompt" {
var t: Terminal = try .init(testing.allocator, .{ .cols = 10, .rows = 10 });
defer t.deinit(testing.allocator);
var s: Stream = .initAlloc(testing.allocator, .init(&t));
defer s.deinit();
// Write some text and then send OSC 133;A (fresh_line_new_prompt)
try s.nextSlice("Hello");
try s.nextSlice("\x1b]133;A\x07");
// Should do a fresh line (carriage return + index)
try testing.expectEqual(@as(usize, 0), t.screens.active.cursor.x);
try testing.expectEqual(@as(usize, 1), t.screens.active.cursor.y);
// Should set cursor semantic_content to prompt
try testing.expectEqual(.prompt, t.screens.active.cursor.semantic_content);
// Test with redraw option
try s.nextSlice("prompt$ ");
try s.nextSlice("\x1b]133;A;redraw=1\x07");
try testing.expect(t.flags.shell_redraws_prompt);
}