akkartik/wardley.love - Change ZO2QM6I3LAT2MACGESCQS24MWGPHDPPIQHDHCRFB42E7WAQ4CTRAC

resolve conflicts

Created by akkartik on July 31, 2023

ZO2QM6I3LAT2MACGESCQS24MWGPHDPPIQHDHCRFB42E7WAQ4CTRAC

Dependencies

In channels

main

Change contents

File deletion: source_text.lua, source_text.lua

BFD:BFD[4.2] → [5.147062:147101]

BFD:BFD[5.147101] → [5.83723:83723]

B:BD[6.1458] → [7.46:91]

B:BD[7.91] → [8.229:263]

B:BD[8.263] → [3.583:1165]

∅:D[3.1165] → [8.347:397]

B:BD[5.88851] → [8.347:397]

B:BD[5.89029] → [9.348:559]

∅:D[9.559] → [5.89029:89039]

B:BD[8.397] → [10.651:1135]

∅:D[8.480] → [11.626:722]

∅:D[10.1135] → [11.626:722]

        -- render search highlight or cursor
        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
          end
        elseif Focus == 'edit' then
      end
      -- render colorized text
      local x = State.left
      for frag in screen_line:gmatch('%S*%s*') do
        select_color(frag)
        App.screen.print(frag, x,y)
        x = x+App.width(frag)
      end
          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.
            Text.draw_cursor(State, State.left+Text.x(screen_line, State.cursor1.pos-pos+1), y)

Deletion in text.lua at line 33 [15.1]
∅:D[12.106] → [13.741:887]
∅:D[16.237] → [13.741:887]
B:BD[17.608] → [13.741:887]
D:D[16.237] → [13.741:887]
BD:BD[16.237] → [13.741:887]
BD:BD[17.608] → [13.741:887]
```
              local lo_px = Text.draw_highlight(State, line, State.left,y, pos, State.cursor1.pos, State.cursor1.pos+utf8.len(State.search_term))
```
Replacement in source_text.lua at line 27 [21.83786]
∅:D[19.237] → [20.614:651]
B:BD[20.614] → [20.614:651]
```
      -- render any link decorations
```
[19.237]
[20.651]
```
      -- render any highlights
```
Insertion in source_text.lua at line 29 [21.83786]
[20.714]
[20.714]
```
        -- render link decorations
```
Deletion in source_text.lua at line 43 [21.83786]
B:BD[22.20777] → [20.1234:1259]
```
      -- render fragment
```

Insertion in source_text.lua at line 47 [21.83786]

[21.88252]

[19.238]

      if not hide_cursor and line_index == State.cursor1.line then
        -- render search highlight or cursor
        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
          end
        elseif Focus == 'edit' then
          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.
            Text.draw_cursor(State, State.left+Text.x(screen_line, State.cursor1.pos-pos+1), y)
          end
        end
      end

Deletion in source_text.lua at line 77 [21.83786]

∅:D[19.449] → [21.88290:88326]

∅:D[12.848] → [21.88290:88326]

∅:D[20.1390] → [21.88290:88326]

B:BD[21.88290] → [21.88290:88326]

B:BD[21.88326] → [20.1391:1539]

∅:D[20.1539] → [21.88475:88511]

B:BD[21.88475] → [21.88475:88511]

B:BD[21.88511] → [14.7:241]

∅:D[14.241] → [20.1540:1686]

B:BD[21.88661] → [20.1540:1686]

∅:D[20.1686] → [21.88798:88834]

B:BD[21.88798] → [21.88798:88834]

B:BD[21.88834] → [20.1687:1760]

∅:D[20.1760] → [21.88898:88952]

B:BD[21.88898] → [21.88898:88952]

B:BD[21.88952] → [19.450:546]

∅:D[19.546] → [21.89066:89102]

∅:D[20.1847] → [21.89066:89102]

B:BD[21.89066] → [21.89066:89102]

      -- render cursor if necessary
      if not hide_cursor and line_index == State.cursor1.line then
        if pos <= State.cursor1.pos and pos + frag_len >= State.cursor1.pos then
          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 lo_px = Text.draw_highlight(State, line, State.left,y, pos, State.cursor1.pos, State.cursor1.pos+utf8.len(State.search_term))
              App.color(Text_color)
              love.graphics.print(State.search_term, State.left+lo_px,y)
            end
          elseif Focus == 'edit' then
            Text.draw_cursor(State, State.left+Text.x(screen_line, State.cursor1.pos-pos+1), y)
          end
        end
      end

resolve conflicts

Dependencies

In channels

Change contents

File deletion: source_text.lua, source_text.lua

Deletion in text.lua at line 33 [15.1]

Replacement in source_text.lua at line 27 [21.83786]

Insertion in source_text.lua at line 29 [21.83786]

Deletion in source_text.lua at line 43 [21.83786]

Insertion in source_text.lua at line 47 [21.83786]

Deletion in source_text.lua at line 77 [21.83786]