Do not allow Window display setup first column to go below 0

mawww · mawww · commit 0f81f572c3d2 · 2025-11-20T16:58:20.000+11:00
This does not make much sense and breaks column highlighting. Fixes #5409
diff --git a/src/window.cc b/src/window.cc
@@ -166,7 +166,7 @@ const DisplayBuffer& Window::update_display_buffer(const Context& context)
         }
 
         auto max_first_column = cursor_pos->column - (setup.widget_columns + setup.scroll_offset.column);
-        setup.first_column = std::min(setup.first_column, max_first_column);
+        setup.first_column = std::max(0_col, std::min(setup.first_column, max_first_column));
 
         auto min_first_column = cursor_pos->column - (m_dimensions.column - setup.scroll_offset.column) + 1;
         setup.first_column = std::max(setup.first_column, min_first_column);
diff --git a/test/regression/5409-scrolloff-incorrectly-offset-column-highlighter/cmd b/test/regression/5409-scrolloff-incorrectly-offset-column-highlighter/cmd
@@ -0,0 +1 @@
+
diff --git a/test/regression/5409-scrolloff-incorrectly-offset-column-highlighter/in b/test/regression/5409-scrolloff-incorrectly-offset-column-highlighter/in
@@ -0,0 +1 @@
+12%(3)456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789
diff --git a/test/regression/5409-scrolloff-incorrectly-offset-column-highlighter/rc b/test/regression/5409-scrolloff-incorrectly-offset-column-highlighter/rc
@@ -0,0 +1,2 @@
+add-highlighter global/ column 71 "default,white"
+set-option global scrolloff 4,4
diff --git a/test/regression/5409-scrolloff-incorrectly-offset-column-highlighter/script b/test/regression/5409-scrolloff-incorrectly-offset-column-highlighter/script
@@ -0,0 +1,2 @@
+ui_out -ignore 1
+ui_out '{ "jsonrpc": "2.0", "method": "draw", "params": [[[{ "face": { "fg": "default", "bg": "default", "underline": "default", "attributes": [] }, "contents": "12" }, { "face": { "fg": "black", "bg": "white", "underline": "default", "attributes": [] }, "contents": "3" }, { "face": { "fg": "default", "bg": "default", "underline": "default", "attributes": [] }, "contents": "456789 123456789 123456789 123456789 123456789 123456789 123456789 " }, { "face": { "fg": "default", "bg": "white", "underline": "default", "attributes": [] }, "contents": "1" }, { "face": { "fg": "default", "bg": "default", "underline": "default", "attributes": [] }, "contents": "23456789\u000a" }]], { "line": 0, "column": 2 }, { "fg": "default", "bg": "default", "underline": "default", "attributes": [] }, { "fg": "blue", "bg": "default", "underline": "default", "attributes": [] }] }'

Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,7 @@ const DisplayBuffer& Window::update_display_buffer(const Context& context)`
`166`	`166`	`}`
`167`	`167`
`168`	`168`	`auto max_first_column = cursor_pos->column - (setup.widget_columns + setup.scroll_offset.column);`
`169`		`- setup.first_column = std::min(setup.first_column, max_first_column);`
	`169`	`+ setup.first_column = std::max(0_col, std::min(setup.first_column, max_first_column));`
`170`	`170`
`171`	`171`	`auto min_first_column = cursor_pos->column - (m_dimensions.column - setup.scroll_offset.column) + 1;`
`172`	`172`	`setup.first_column = std::max(setup.first_column, min_first_column);`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+12%(3)456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+add-highlighter global/ column 71 "default,white"`
	`2`	`+set-option global scrolloff 4,4`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+ui_out -ignore 1`
	`2`	+ui_out '{ "jsonrpc": "2.0", "method": "draw", "params": [[[{ "face": { "fg": "default", "bg": "default", "underline": "default", "attributes": [] }, "contents": "12" }, { "face": { "fg": "black", "bg": "white", "underline": "default", "attributes": [] }, "contents": "3" }, { "face": { "fg": "default", "bg": "default", "underline": "default", "attributes": [] }, "contents": "456789 123456789 123456789 123456789 123456789 123456789 123456789 " }, { "face": { "fg": "default", "bg": "white", "underline": "default", "attributes": [] }, "contents": "1" }, { "face": { "fg": "default", "bg": "default", "underline": "default", "attributes": [] }, "contents": "23456789\u000a" }]], { "line": 0, "column": 2 }, { "fg": "default", "bg": "default", "underline": "default", "attributes": [] }, { "fg": "blue", "bg": "default", "underline": "default", "attributes": [] }] }'