akkartik/wardley.love - Change PZ3H5QQIQT2OVT3O3GQJOTCB6KWFF5TUETKVXWIQK57FSNFZTKWQC

resolve conflicts

Created by akkartik on July 31, 2023

PZ3H5QQIQT2OVT3O3GQJOTCB6KWFF5TUETKVXWIQK57FSNFZTKWQC

Dependencies

In channels

main

Change contents

Deletion in text.lua at line 37 [6.1]

B:BD[5.458] → [2.3:237]

BD:BD[5.458] → [2.3:237]

∅:D[2.237] → [8.26:172]

B:BD[9.1893] → [8.26:172]

∅:D[8.172] → [10.3604:3632]

B:BD[11.1566] → [10.3604:3632]

B:BD[10.3632] → [8.174:174]

BD:BD[10.3632] → [8.174:174]

∅:D[8.174] → [13.888:961]

B:BD[5.774] → [13.888:961]

BD:BD[5.774] → [13.888:961]

            local data = State.lines[State.cursor1.line].data
            local cursor_offset = Text.offset(data, State.cursor1.pos)
            if data:sub(cursor_offset, cursor_offset+#State.search_term-1) == State.search_term then
              local lo_px = Text.draw_highlight(State, line, State.left,y, pos, State.cursor1.pos, State.cursor1.pos+utf8.len(State.search_term))
              App.color(fg)
              love.graphics.print(State.search_term, State.left+lo_px,y)

Resurrecting zombie bytes in text.lua at line 37 [6.1]

B:B[14.45] → [7.0:34]

BD:B[14.45] → [7.0:34]

B:B[7.34] → [4.0:582]

BD:B[7.34] → [4.0:582]

        if State.search_term then
          local data = State.lines[State.cursor1.line].data
          local cursor_offset = Text.offset(data, State.cursor1.pos)
          if data:sub(cursor_offset, cursor_offset+#State.search_term-1) == State.search_term then
            local save_selection = State.selection1
            State.selection1 = {line=line_index, pos=State.cursor1.pos+utf8.len(State.search_term)}
            local lo, hi = Text.clip_selection(State, line_index, pos, pos+frag_len)
            Text.draw_highlight(State, line, State.left,y, pos, lo,hi)
            State.selection1 = save_selection

Replacement in text.lua at line 46 [6.1]

B:BD[5.854] → [3.4:157]

BD:BD[5.854] → [3.4:157]

∅:D[3.157] → [15.6:6]

B:BD[10.3671] → [15.6:6]

B:BD[15.6] → [15.7:121]

          elseif hide_cursor then
            Text.pretend_draw_cursor(State, State.left+Text.x(screen_line, State.cursor1.pos-pos+1), y)
          else
            Text.draw_cursor(State, State.left+Text.x(screen_line, State.cursor1.pos-pos+1), y, Cursor_color, fg)

[4.582]

[16.530]

          end
        else
          if pos <= State.cursor1.pos and pos + frag_len > State.cursor1.pos then
            if hide_cursor then
              Text.pretend_draw_cursor(State, State.left+Text.x(screen_line, State.cursor1.pos-pos+1), y)
            else
              Text.draw_cursor(State, State.left+Text.x(screen_line, State.cursor1.pos-pos+1), y, Cursor_color, fg)
            end
          elseif pos + frag_len == State.cursor1.pos then
            -- Show cursor at end of line.
            -- This place also catches end of wrapping screen lines. That doesn't seem worth distinguishing.
            -- It seems useful to see a cursor whether your eye is on the left or right margin.
            if hide_cursor then
              Text.pretend_draw_cursor(State, State.left+Text.x(screen_line, State.cursor1.pos-pos+1), y)
            else
              Text.draw_cursor(State, State.left+Text.x(screen_line, State.cursor1.pos-pos+1), y, Cursor_color, fg)
            end

Deletion in text.lua at line 965 [6.1]

B:BD[17.442] → [2.239:239]

∅:D[4.582] → [7.118:145]

B:BD[5.854] → [7.118:145]

BD:BD[5.854] → [7.118:145]

B:BD[7.145] → [18.83:567]

BD:BD[7.145] → [18.83:567]

          end
        else
          if pos <= State.cursor1.pos and pos + frag_len > State.cursor1.pos then
            Text.draw_cursor(State, State.left+Text.x(screen_line, State.cursor1.pos-pos+1), y)
          elseif pos + frag_len == State.cursor1.pos then
            -- Show cursor at end of line.
            -- This place also catches end of wrapping screen lines. That doesn't seem worth distinguishing.
            -- It seems useful to see a cursor whether your eye is on the left or right margin.

Solving an order conflict in text.lua at line 965 [6.1]
[17.442]