src/tui/editor.zig

@@ -3759,8 +3759,6 @@ pub const Editor = struct {
         var cursel: CurSel = .{};
         cursel.cursor = cursor;
         try move_cursor_begin(root, &cursel.cursor, self.metrics);
-        if (root.line_width(cursel.cursor.row, self.metrics) catch 0 == 0)
-            return root;
         switch (self.indent_mode) {
             .spaces, .auto => {
                 const cols = self.indent_size - find_first_non_ws(root, cursel.cursor.row, self.metrics) % self.indent_size;
@@ -4524,7 +4522,7 @@ pub const Editor = struct {
 
     fn cursel_smart_insert_line(self: *Self, root: Buffer.Root, cursel: *CurSel, b_allocator: std.mem.Allocator, mode: WSCollapseMode) !Buffer.Root {
         const row = cursel.cursor.row;
-        const leading_ws = find_first_non_ws(root, row, self.metrics);
+        const leading_ws = @min(find_first_non_ws(root, row, self.metrics), cursel.cursor.col);
         var sfa = std.heap.stackFallback(512, self.allocator);
         const sfa_allocator = sfa.get();
         var stream: std.Io.Writer.Allocating = .init(sfa_allocator);