mirrors/ghostty
1
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2026-04-14 03:25:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

terminal: rename semantic prompt

Browse Source
This commit is contained in:
Mitchell Hashimoto
2026-01-26 13:27:44 -08:00
parent 5f77b0ed98
commit c3e15a5cb6
5 changed files with 95 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/renderer/row.zig
View File

@@ -15,7 +15,7 @@ pub fn neverExtendBg(
// Any semantic prompts should not have their background extended
// because prompts often contain special formatting (such as
// powerline) that looks bad when extended.
switch (row.semantic_prompt2) {
switch (row.semantic_prompt) {
.prompt, .prompt_continuation => return true,
.no_prompt => {},
}

142
src/terminal/PageList.zig
View File

@@ -1229,7 +1229,7 @@ const ReflowCursor = struct {
// If the row has a semantic prompt then the blank row is meaningful
// so we just consider pretend the first cell of the row isn't empty.
if (cols_len == 0 and src_row.semantic_prompt2 != .no_prompt) cols_len = 1;
if (cols_len == 0 and src_row.semantic_prompt != .no_prompt) cols_len = 1;
}
// Handle tracked pin adjustments.
@@ -1973,13 +1973,13 @@ const ReflowCursor = struct {
// If the row has a semantic prompt then the blank row is meaningful
// so we always return all but one so that the row is drawn.
if (self.page_row.semantic_prompt2 != .no_prompt) return len - 1;
if (self.page_row.semantic_prompt != .no_prompt) return len - 1;
return len;
}
fn copyRowMetadata(self: *ReflowCursor, other: *const Row) void {
self.page_row.semantic_prompt2 = other.semantic_prompt2;
self.page_row.semantic_prompt = other.semantic_prompt;
}
};
@@ -4403,7 +4403,7 @@ pub const PromptIterator = struct {
const at_limit = if (self.limit) |limit| limit.eql(p) else false;
const rac = p.rowAndCell();
switch (rac.row.semantic_prompt2) {
switch (rac.row.semantic_prompt) {
// This row isn't a prompt. Keep looking.
.no_prompt => if (at_limit) break,
@@ -4422,7 +4422,7 @@ pub const PromptIterator = struct {
// up to our limit.
var end_pin = p;
while (end_pin.down(1)) |next_pin| : (end_pin = next_pin) {
switch (next_pin.rowAndCell().row.semantic_prompt2) {
switch (next_pin.rowAndCell().row.semantic_prompt) {
.prompt_continuation => if (self.limit) |limit| {
if (limit.eql(next_pin)) break;
},
@@ -4456,7 +4456,7 @@ pub const PromptIterator = struct {
const at_limit = if (self.limit) |limit| limit.eql(p) else false;
const rac = p.rowAndCell();
switch (rac.row.semantic_prompt2) {
switch (rac.row.semantic_prompt) {
// This row isn't a prompt. Keep looking.
.no_prompt => if (at_limit) break,
@@ -4483,7 +4483,7 @@ pub const PromptIterator = struct {
if (limit.eql(prior)) break;
}
switch (prior.rowAndCell().row.semantic_prompt2) {
switch (prior.rowAndCell().row.semantic_prompt) {
// No prompt. That means our last pin is good!
.no_prompt => {
self.current = prior;
@@ -6771,11 +6771,11 @@ test "PageList: jump zero prompts" {
const page = &s.pages.first.?.data;
{
const rac = page.getRowAndCell(0, 1);
rac.row.semantic_prompt2 = .prompt;
rac.row.semantic_prompt = .prompt;
}
{
const rac = page.getRowAndCell(0, 5);
rac.row.semantic_prompt2 = .prompt;
rac.row.semantic_prompt = .prompt;
}
s.scroll(.{ .delta_prompt = 0 });
@@ -6799,11 +6799,11 @@ test "Screen: jump back one prompt" {
const page = &s.pages.first.?.data;
{
const rac = page.getRowAndCell(0, 1);
rac.row.semantic_prompt2 = .prompt;
rac.row.semantic_prompt = .prompt;
}
{
const rac = page.getRowAndCell(0, 5);
rac.row.semantic_prompt2 = .prompt;
rac.row.semantic_prompt = .prompt;
}
// Jump back
@@ -7906,25 +7906,25 @@ test "PageList promptIterator left_up" {
// Normal prompt
{
const rac = page.getRowAndCell(0, 3);
rac.row.semantic_prompt2 = .prompt;
rac.row.semantic_prompt = .prompt;
}
// Continuation
{
const rac = page.getRowAndCell(0, 6);
rac.row.semantic_prompt2 = .prompt;
rac.row.semantic_prompt = .prompt;
}
{
const rac = page.getRowAndCell(0, 7);
rac.row.semantic_prompt2 = .prompt_continuation;
rac.row.semantic_prompt = .prompt_continuation;
}
{
const rac = page.getRowAndCell(0, 8);
rac.row.semantic_prompt2 = .prompt_continuation;
rac.row.semantic_prompt = .prompt_continuation;
}
// Broken continuation that has non-prompts in between
{
const rac = page.getRowAndCell(0, 12);
rac.row.semantic_prompt2 = .prompt_continuation;
rac.row.semantic_prompt = .prompt_continuation;
}
var it = s.promptIterator(.left_up, .{ .screen = .{} }, null);
@@ -7963,25 +7963,25 @@ test "PageList promptIterator right_down" {
// Normal prompt
{
const rac = page.getRowAndCell(0, 3);
rac.row.semantic_prompt2 = .prompt;
rac.row.semantic_prompt = .prompt;
}
// Continuation (prompt on row 6, continuation on rows 7-8)
{
const rac = page.getRowAndCell(0, 6);
rac.row.semantic_prompt2 = .prompt;
rac.row.semantic_prompt = .prompt;
}
{
const rac = page.getRowAndCell(0, 7);
rac.row.semantic_prompt2 = .prompt_continuation;
rac.row.semantic_prompt = .prompt_continuation;
}
{
const rac = page.getRowAndCell(0, 8);
rac.row.semantic_prompt2 = .prompt_continuation;
rac.row.semantic_prompt = .prompt_continuation;
}
// Broken continuation that has non-prompts in between (orphaned continuation at row 12)
{
const rac = page.getRowAndCell(0, 12);
rac.row.semantic_prompt2 = .prompt_continuation;
rac.row.semantic_prompt = .prompt_continuation;
}
var it = s.promptIterator(.right_down, .{ .screen = .{} }, null);
@@ -8021,16 +8021,16 @@ test "PageList promptIterator right_down continuation at start" {
// Prompt continuation at row 0 (no prior rows - simulates trimmed scrollback)
{
const rac = page.getRowAndCell(0, 0);
rac.row.semantic_prompt2 = .prompt_continuation;
rac.row.semantic_prompt = .prompt_continuation;
}
{
const rac = page.getRowAndCell(0, 1);
rac.row.semantic_prompt2 = .prompt_continuation;
rac.row.semantic_prompt = .prompt_continuation;
}
// Normal prompt later
{
const rac = page.getRowAndCell(0, 5);
rac.row.semantic_prompt2 = .prompt;
rac.row.semantic_prompt = .prompt;
}
var it = s.promptIterator(.right_down, .{ .screen = .{} }, null);
@@ -8065,15 +8065,15 @@ test "PageList promptIterator right_down with prompt before continuation" {
// Starting iteration from row 3 should still find the prompt at row 2
{
const rac = page.getRowAndCell(0, 2);
rac.row.semantic_prompt2 = .prompt;
rac.row.semantic_prompt = .prompt;
}
{
const rac = page.getRowAndCell(0, 3);
rac.row.semantic_prompt2 = .prompt_continuation;
rac.row.semantic_prompt = .prompt_continuation;
}
{
const rac = page.getRowAndCell(0, 4);
rac.row.semantic_prompt2 = .prompt_continuation;
rac.row.semantic_prompt = .prompt_continuation;
}
// Start iteration from row 3 (middle of the continuation)
@@ -8103,12 +8103,12 @@ test "PageList promptIterator right_down limit inclusive" {
// Prompt on row 5
{
const rac = page.getRowAndCell(0, 5);
rac.row.semantic_prompt2 = .prompt;
rac.row.semantic_prompt = .prompt;
}
// Prompt on row 10
{
const rac = page.getRowAndCell(0, 10);
rac.row.semantic_prompt2 = .prompt;
rac.row.semantic_prompt = .prompt;
}
// Iterate with limit at row 5 (the prompt row) - should include it
@@ -8135,12 +8135,12 @@ test "PageList promptIterator left_up limit inclusive" {
// Prompt on row 5
{
const rac = page.getRowAndCell(0, 5);
rac.row.semantic_prompt2 = .prompt;
rac.row.semantic_prompt = .prompt;
}
// Prompt on row 10
{
const rac = page.getRowAndCell(0, 10);
rac.row.semantic_prompt2 = .prompt;
rac.row.semantic_prompt = .prompt;
}
// Iterate with limit at row 10 (the prompt row) - should include it
@@ -8168,7 +8168,7 @@ test "PageList highlightSemanticContent prompt" {
// Prompt on row 5
{
const rac = page.getRowAndCell(0, 5);
rac.row.semantic_prompt2 = .prompt;
rac.row.semantic_prompt = .prompt;
// Start the prompt for the first 5 cols
for (0..5) |x| {
@@ -8193,7 +8193,7 @@ test "PageList highlightSemanticContent prompt" {
// Prompt on row 10
{
const rac = page.getRowAndCell(0, 10);
rac.row.semantic_prompt2 = .prompt;
rac.row.semantic_prompt = .prompt;
}
const hl = s.highlightSemanticContent(
@@ -8222,7 +8222,7 @@ test "PageList highlightSemanticContent prompt with output" {
// Prompt on row 5
{
const rac = page.getRowAndCell(0, 5);
rac.row.semantic_prompt2 = .prompt;
rac.row.semantic_prompt = .prompt;
// First 3 cols are prompt
for (0..3) |x| {
@@ -8257,7 +8257,7 @@ test "PageList highlightSemanticContent prompt with output" {
// Prompt on row 10
{
const rac = page.getRowAndCell(0, 10);
rac.row.semantic_prompt2 = .prompt;
rac.row.semantic_prompt = .prompt;
}
// Highlighting from prompt should include prompt and input, but stop at output
@@ -8287,7 +8287,7 @@ test "PageList highlightSemanticContent prompt multiline" {
// Prompt starts on row 5
{
const rac = page.getRowAndCell(0, 5);
rac.row.semantic_prompt2 = .prompt;
rac.row.semantic_prompt = .prompt;
// First row is all prompt
for (0..10) |x| {
@@ -8313,7 +8313,7 @@ test "PageList highlightSemanticContent prompt multiline" {
// Prompt on row 10
{
const rac = page.getRowAndCell(0, 10);
rac.row.semantic_prompt2 = .prompt;
rac.row.semantic_prompt = .prompt;
}
// Highlighting should span both rows
@@ -8343,7 +8343,7 @@ test "PageList highlightSemanticContent prompt only" {
// Prompt on row 5 with only prompt content (no input)
{
const rac = page.getRowAndCell(0, 5);
rac.row.semantic_prompt2 = .prompt;
rac.row.semantic_prompt = .prompt;
for (0..5) |x| {
const cell = page.getRowAndCell(x, 5).cell;
@@ -8357,7 +8357,7 @@ test "PageList highlightSemanticContent prompt only" {
// Prompt on row 10
{
const rac = page.getRowAndCell(0, 10);
rac.row.semantic_prompt2 = .prompt;
rac.row.semantic_prompt = .prompt;
}
// Highlighting should only include the prompt cells
@@ -8387,7 +8387,7 @@ test "PageList highlightSemanticContent prompt to end of screen" {
// Single prompt on row 15, no following prompt
{
const rac = page.getRowAndCell(0, 15);
rac.row.semantic_prompt2 = .prompt;
rac.row.semantic_prompt = .prompt;
for (0..3) |x| {
const cell = page.getRowAndCell(x, 15).cell;
@@ -8435,7 +8435,7 @@ test "PageList highlightSemanticContent input basic" {
// Prompt on row 5
{
const rac = page.getRowAndCell(0, 5);
rac.row.semantic_prompt2 = .prompt;
rac.row.semantic_prompt = .prompt;
// First 3 cols are prompt
for (0..3) |x| {
@@ -8460,7 +8460,7 @@ test "PageList highlightSemanticContent input basic" {
// Prompt on row 10
{
const rac = page.getRowAndCell(0, 10);
rac.row.semantic_prompt2 = .prompt;
rac.row.semantic_prompt = .prompt;
}
// Highlighting input should only include input cells
@@ -8490,7 +8490,7 @@ test "PageList highlightSemanticContent input with output" {
// Prompt on row 5
{
const rac = page.getRowAndCell(0, 5);
rac.row.semantic_prompt2 = .prompt;
rac.row.semantic_prompt = .prompt;
// First 2 cols are prompt
for (0..2) |x| {
@@ -8525,7 +8525,7 @@ test "PageList highlightSemanticContent input with output" {
// Prompt on row 10
{
const rac = page.getRowAndCell(0, 10);
rac.row.semantic_prompt2 = .prompt;
rac.row.semantic_prompt = .prompt;
}
// Highlighting input should stop at output
@@ -8555,7 +8555,7 @@ test "PageList highlightSemanticContent input multiline with continuation" {
// Prompt on row 5
{
const rac = page.getRowAndCell(0, 5);
rac.row.semantic_prompt2 = .prompt;
rac.row.semantic_prompt = .prompt;
// First 2 cols are prompt
for (0..2) |x| {
@@ -8602,7 +8602,7 @@ test "PageList highlightSemanticContent input multiline with continuation" {
// Prompt on row 10
{
const rac = page.getRowAndCell(0, 10);
rac.row.semantic_prompt2 = .prompt;
rac.row.semantic_prompt = .prompt;
}
// Highlighting input should span both rows, skipping continuation prompts
@@ -8632,7 +8632,7 @@ test "PageList highlightSemanticContent input no input returns null" {
// Prompt on row 5 with only prompt, then immediately output
{
const rac = page.getRowAndCell(0, 5);
rac.row.semantic_prompt2 = .prompt;
rac.row.semantic_prompt = .prompt;
// First 3 cols are prompt
for (0..3) |x| {
@@ -8657,7 +8657,7 @@ test "PageList highlightSemanticContent input no input returns null" {
// Prompt on row 10
{
const rac = page.getRowAndCell(0, 10);
rac.row.semantic_prompt2 = .prompt;
rac.row.semantic_prompt = .prompt;
}
// Highlighting input should return null when there's no input
@@ -8680,7 +8680,7 @@ test "PageList highlightSemanticContent input to end of screen" {
// Single prompt on row 15, no following prompt
{
const rac = page.getRowAndCell(0, 15);
rac.row.semantic_prompt2 = .prompt;
rac.row.semantic_prompt = .prompt;
for (0..2) |x| {
const cell = page.getRowAndCell(x, 15).cell;
@@ -8728,7 +8728,7 @@ test "PageList highlightSemanticContent input prompt only returns null" {
// Prompt on row 5 with only prompt content, no input or output
{
const rac = page.getRowAndCell(0, 5);
rac.row.semantic_prompt2 = .prompt;
rac.row.semantic_prompt = .prompt;
// All cells are prompt
for (0..10) |x| {
@@ -8752,7 +8752,7 @@ test "PageList highlightSemanticContent input prompt only returns null" {
// Prompt on row 10
{
const rac = page.getRowAndCell(0, 10);
rac.row.semantic_prompt2 = .prompt;
rac.row.semantic_prompt = .prompt;
}
// Highlighting input should return null when there's only prompts
@@ -8775,7 +8775,7 @@ test "PageList highlightSemanticContent output basic" {
// Prompt on row 5
{
const rac = page.getRowAndCell(0, 5);
rac.row.semantic_prompt2 = .prompt;
rac.row.semantic_prompt = .prompt;
// First 2 cols are prompt
for (0..2) |x| {
@@ -8816,7 +8816,7 @@ test "PageList highlightSemanticContent output basic" {
// Prompt on row 10
{
const rac = page.getRowAndCell(0, 10);
rac.row.semantic_prompt2 = .prompt;
rac.row.semantic_prompt = .prompt;
}
// Highlighting output should only include output cells
@@ -8846,7 +8846,7 @@ test "PageList highlightSemanticContent output multiline" {
// Prompt on row 5
{
const rac = page.getRowAndCell(0, 5);
rac.row.semantic_prompt2 = .prompt;
rac.row.semantic_prompt = .prompt;
// First 2 cols are prompt
for (0..2) |x| {
@@ -8907,7 +8907,7 @@ test "PageList highlightSemanticContent output multiline" {
// Prompt on row 10
{
const rac = page.getRowAndCell(0, 10);
rac.row.semantic_prompt2 = .prompt;
rac.row.semantic_prompt = .prompt;
}
// Highlighting output should span multiple rows
@@ -8937,7 +8937,7 @@ test "PageList highlightSemanticContent output stops at next prompt" {
// Prompt on row 5
{
const rac = page.getRowAndCell(0, 5);
rac.row.semantic_prompt2 = .prompt;
rac.row.semantic_prompt = .prompt;
// First 2 cols are prompt
for (0..2) |x| {
@@ -8992,7 +8992,7 @@ test "PageList highlightSemanticContent output stops at next prompt" {
// Prompt on row 10
{
const rac = page.getRowAndCell(0, 10);
rac.row.semantic_prompt2 = .prompt;
rac.row.semantic_prompt = .prompt;
}
// Highlighting output should stop before prompt/input
@@ -9022,7 +9022,7 @@ test "PageList highlightSemanticContent output to end of screen" {
// Single prompt on row 15, no following prompt
{
const rac = page.getRowAndCell(0, 15);
rac.row.semantic_prompt2 = .prompt;
rac.row.semantic_prompt = .prompt;
for (0..2) |x| {
const cell = page.getRowAndCell(x, 15).cell;
@@ -9094,7 +9094,7 @@ test "PageList highlightSemanticContent output no output returns null" {
// Prompt on row 5 with only prompt and input, no output
{
const rac = page.getRowAndCell(0, 5);
rac.row.semantic_prompt2 = .prompt;
rac.row.semantic_prompt = .prompt;
// First 3 cols are prompt
for (0..3) |x| {
@@ -9128,7 +9128,7 @@ test "PageList highlightSemanticContent output no output returns null" {
// Prompt on row 10 (no output between prompts)
{
const rac = page.getRowAndCell(0, 10);
rac.row.semantic_prompt2 = .prompt;
rac.row.semantic_prompt = .prompt;
}
// Highlighting output should return null when there's no output
@@ -9154,7 +9154,7 @@ test "PageList highlightSemanticContent output skips empty cells" {
// Prompt on row 5 - only fills first 3 cells, rest are empty with default .output
{
const rac = page.getRowAndCell(0, 5);
rac.row.semantic_prompt2 = .prompt;
rac.row.semantic_prompt = .prompt;
// First 3 cols are prompt with text
for (0..3) |x| {
@@ -9199,7 +9199,7 @@ test "PageList highlightSemanticContent output skips empty cells" {
// Prompt on row 10
{
const rac = page.getRowAndCell(0, 10);
rac.row.semantic_prompt2 = .prompt;
rac.row.semantic_prompt = .prompt;
}
// Highlighting output should skip empty cells on rows 5-6 and find
@@ -11553,7 +11553,7 @@ test "PageList resize reflow more cols no reflow preserves semantic prompt" {
try testing.expect(s.pages.first == s.pages.last);
const page = &s.pages.first.?.data;
const rac = page.getRowAndCell(0, 1);
rac.row.semantic_prompt2 = .prompt;
rac.row.semantic_prompt = .prompt;
}
// Resize
@@ -11565,7 +11565,7 @@ test "PageList resize reflow more cols no reflow preserves semantic prompt" {
try testing.expect(s.pages.first == s.pages.last);
const page = &s.pages.first.?.data;
const rac = page.getRowAndCell(0, 1);
try testing.expect(rac.row.semantic_prompt2 == .prompt);
try testing.expect(rac.row.semantic_prompt == .prompt);
}
}
@@ -12128,7 +12128,7 @@ test "PageList resize reflow less cols no reflow preserves semantic prompt" {
const page = &s.pages.first.?.data;
{
const rac = page.getRowAndCell(0, 1);
rac.row.semantic_prompt2 = .prompt;
rac.row.semantic_prompt = .prompt;
}
for (0..s.cols) |x| {
const rac = page.getRowAndCell(x, 1);
@@ -12150,12 +12150,12 @@ test "PageList resize reflow less cols no reflow preserves semantic prompt" {
const p = s.pin(.{ .active = .{ .y = 1 } }).?;
const rac = p.rowAndCell();
try testing.expect(rac.row.wrap);
try testing.expect(rac.row.semantic_prompt2 == .prompt);
try testing.expect(rac.row.semantic_prompt == .prompt);
}
{
const p = s.pin(.{ .active = .{ .y = 2 } }).?;
const rac = p.rowAndCell();
try testing.expect(rac.row.semantic_prompt2 == .prompt);
try testing.expect(rac.row.semantic_prompt == .prompt);
}
}
}
@@ -12170,7 +12170,7 @@ test "PageList resize reflow less cols no reflow preserves semantic prompt on fi
try testing.expect(s.pages.first == s.pages.last);
const page = &s.pages.first.?.data;
const rac = page.getRowAndCell(0, 0);
rac.row.semantic_prompt2 = .prompt;
rac.row.semantic_prompt = .prompt;
}
// Resize
@@ -12182,7 +12182,7 @@ test "PageList resize reflow less cols no reflow preserves semantic prompt on fi
try testing.expect(s.pages.first == s.pages.last);
const page = &s.pages.first.?.data;
const rac = page.getRowAndCell(0, 0);
try testing.expect(rac.row.semantic_prompt2 == .prompt);
try testing.expect(rac.row.semantic_prompt == .prompt);
}
}
@@ -12196,7 +12196,7 @@ test "PageList resize reflow less cols wrap preserves semantic prompt" {
try testing.expect(s.pages.first == s.pages.last);
const page = &s.pages.first.?.data;
const rac = page.getRowAndCell(0, 0);
rac.row.semantic_prompt2 = .prompt;
rac.row.semantic_prompt = .prompt;
}
// Resize
@@ -12208,7 +12208,7 @@ test "PageList resize reflow less cols wrap preserves semantic prompt" {
try testing.expect(s.pages.first == s.pages.last);
const page = &s.pages.first.?.data;
const rac = page.getRowAndCell(0, 0);
try testing.expect(rac.row.semantic_prompt2 == .prompt);
try testing.expect(rac.row.semantic_prompt == .prompt);
}
}

22
src/terminal/Screen.zig
View File

@@ -1683,7 +1683,7 @@ pub inline fn resize(
// If our cursor is on a prompt line, then we clear the prompt so
// the shell can redraw it. This works with OSC133 semantic prompts.
if (opts.prompt_redraw and
self.cursor.page_row.semantic_prompt2 != .no_prompt)
self.cursor.page_row.semantic_prompt != .no_prompt)
prompt: {
const start = start: {
var it = self.cursor.page_pin.promptIterator(
@@ -2342,7 +2342,7 @@ pub fn cursorSetSemanticContent(self: *Screen, t: union(enum) {
self.flags.semantic_content = true;
cursor.semantic_content = .prompt;
cursor.semantic_content_clear_eol = false;
cursor.page_row.semantic_prompt2 = switch (kind) {
cursor.page_row.semantic_prompt = switch (kind) {
.initial, .right => .prompt,
.continuation, .secondary => .prompt_continuation,
};
@@ -2920,7 +2920,7 @@ pub fn promptPath(
} {
// Verify "from" is on a prompt row before calling highlightSemanticContent.
// highlightSemanticContent asserts the starting point is a prompt.
switch (from.rowAndCell().row.semantic_prompt2) {
switch (from.rowAndCell().row.semantic_prompt) {
.prompt, .prompt_continuation => {},
.no_prompt => return .{ .x = 0, .y = 0 },
}
@@ -3043,7 +3043,7 @@ pub fn testWriteString(self: *Screen, text: []const u8) !void {
self.cursorSetSemanticContent(.output);
} else switch (self.cursor.semantic_content) {
.input, .output => {},
.prompt => self.cursor.page_row.semantic_prompt2 = .prompt_continuation,
.prompt => self.cursor.page_row.semantic_prompt = .prompt_continuation,
}
continue;
}
@@ -3079,7 +3079,7 @@ pub fn testWriteString(self: *Screen, text: []const u8) !void {
self.cursor.page_row.wrap_continuation = true;
switch (self.cursor.semantic_content) {
.input, .output => {},
.prompt => self.cursor.page_row.semantic_prompt2 = .prompt_continuation,
.prompt => self.cursor.page_row.semantic_prompt = .prompt_continuation,
}
}
@@ -6088,15 +6088,15 @@ test "Screen: resize more cols no reflow preserves semantic prompt" {
// Our one row should still be a semantic prompt, the others should not.
{
const list_cell = s.pages.getCell(.{ .active = .{ .x = 0, .y = 0 } }).?;
try testing.expect(list_cell.row.semantic_prompt2 == .no_prompt);
try testing.expect(list_cell.row.semantic_prompt == .no_prompt);
}
{
const list_cell = s.pages.getCell(.{ .active = .{ .x = 0, .y = 1 } }).?;
try testing.expect(list_cell.row.semantic_prompt2 == .prompt);
try testing.expect(list_cell.row.semantic_prompt == .prompt);
}
{
const list_cell = s.pages.getCell(.{ .active = .{ .x = 0, .y = 2 } }).?;
try testing.expect(list_cell.row.semantic_prompt2 == .no_prompt);
try testing.expect(list_cell.row.semantic_prompt == .no_prompt);
}
}
@@ -8474,7 +8474,7 @@ test "Screen: promptPath" {
// Row 2: prompt (with prompt cells) and input
{
const rac = page.getRowAndCell(0, 2);
rac.row.semantic_prompt2 = .prompt;
rac.row.semantic_prompt = .prompt;
// First 3 cols are prompt
for (0..3) |x| {
const cell = page.getRowAndCell(x, 2).cell;
@@ -8497,7 +8497,7 @@ test "Screen: promptPath" {
// Row 3: continuation line with input cells (same prompt block)
{
const rac = page.getRowAndCell(0, 3);
rac.row.semantic_prompt2 = .prompt_continuation;
rac.row.semantic_prompt = .prompt_continuation;
for (0..6) |x| {
const cell = page.getRowAndCell(x, 3).cell;
cell.* = .{
@@ -8510,7 +8510,7 @@ test "Screen: promptPath" {
// Row 6: next prompt + input on same line
{
const rac = page.getRowAndCell(0, 6);
rac.row.semantic_prompt2 = .prompt;
rac.row.semantic_prompt = .prompt;
for (0..2) |x| {
const cell = page.getRowAndCell(x, 6).cell;
cell.* = .{

18
src/terminal/Terminal.zig
View File

@@ -776,7 +776,7 @@ fn printWrap(self: *Terminal) !void {
cursor.semantic_content_clear_eol = old_semantic_clear;
switch (old_semantic) {
.output, .input => {},
.prompt => cursor.page_row.semantic_prompt2 = .prompt_continuation,
.prompt => cursor.page_row.semantic_prompt = .prompt_continuation,
}
if (mark_wrap) {
@@ -1200,7 +1200,7 @@ pub fn cursorIsAtPrompt(self: *Terminal) bool {
// If our page row is a prompt then we're always at a prompt
const cursor: *const Screen.Cursor = &self.screens.active.cursor;
if (cursor.page_row.semantic_prompt2 != .no_prompt) return true;
if (cursor.page_row.semantic_prompt != .no_prompt) return true;
// Otherwise, determine our cursor state
return switch (cursor.semantic_content) {
@@ -2347,7 +2347,7 @@ pub fn eraseDisplay(
);
while (it.next()) |p| {
const row = p.rowAndCell().row;
switch (row.semantic_prompt2) {
switch (row.semantic_prompt) {
// If we're at a prompt or input area, then we are at a prompt.
.prompt,
.prompt_continuation,
@@ -4328,11 +4328,11 @@ test "Terminal: soft wrap with semantic prompt" {
for ("hello") |c| try t.print(c);
{
const list_cell = t.screens.active.pages.getCell(.{ .screen = .{ .x = 0, .y = 0 } }).?;
try testing.expectEqual(.prompt, list_cell.row.semantic_prompt2);
try testing.expectEqual(.prompt, list_cell.row.semantic_prompt);
}
{
const list_cell = t.screens.active.pages.getCell(.{ .screen = .{ .x = 0, .y = 1 } }).?;
try testing.expectEqual(.prompt_continuation, list_cell.row.semantic_prompt2);
try testing.expectEqual(.prompt_continuation, list_cell.row.semantic_prompt);
}
}
@@ -11302,7 +11302,7 @@ test "Terminal: semantic prompt" {
try testing.expectEqual(.prompt, cell.semantic_content);
const row = list_cell.row;
try testing.expectEqual(.prompt, row.semantic_prompt2);
try testing.expectEqual(.prompt, row.semantic_prompt);
}
// Start input but end it on EOL
@@ -11323,7 +11323,7 @@ test "Terminal: semantic prompt" {
try testing.expectEqual(.output, cell.semantic_content);
const row = list_cell.row;
try testing.expectEqual(.no_prompt, row.semantic_prompt2);
try testing.expectEqual(.no_prompt, row.semantic_prompt);
}
}
@@ -11346,7 +11346,7 @@ test "Terminal: semantic prompt continuations" {
try testing.expectEqual(.prompt, cell.semantic_content);
const row = list_cell.row;
try testing.expectEqual(.prompt, row.semantic_prompt2);
try testing.expectEqual(.prompt, row.semantic_prompt);
}
// Start input but end it on EOL
@@ -11370,7 +11370,7 @@ test "Terminal: semantic prompt continuations" {
try testing.expectEqual(.prompt, cell.semantic_content);
const row = list_cell.row;
try testing.expectEqual(.prompt_continuation, row.semantic_prompt2);
try testing.expectEqual(.prompt_continuation, row.semantic_prompt);
}
}

6
src/terminal/page.zig
View File

@@ -1907,7 +1907,7 @@ pub const Row = packed struct(u64) {
/// This may contain false positives but never false negatives. If
/// this is set, you should still check individual cells to see if they
/// have prompt semantics.
semantic_prompt2: SemanticPrompt2 = .no_prompt,
semantic_prompt: SemanticPrompt = .no_prompt,
/// True if this row contains a virtual placeholder for the Kitty
/// graphics protocol. (U+10EEEE)
@@ -1931,8 +1931,8 @@ pub const Row = packed struct(u64) {
_padding: u23 = 0,
/// The semantic prompt state of the row. See `semantic_prompt2`.
pub const SemanticPrompt2 = enum(u2) {
/// The semantic prompt state of the row. See `semantic_prompt`.
pub const SemanticPrompt = enum(u2) {
/// No prompt cells in this row.
no_prompt = 0,
/// Prompt cells exist in this row.