Merge carousel2.love

edit.lua

···
   return endpos-#pat+1
 end
 
---? function test_rfind()
---?   check_eq(I.rfind('abc', ''), 3, 'empty pattern')
---?   check_eq(I.rfind('abc', 'c'), 3, 'final char')
---?   check_eq(I.rfind('acbc', 'c', 3), 2, 'previous char')
---?   check_nil(I.rfind('abc', 'd'), 'missing char')
---?   check_nil(I.rfind('abc', 'c', 2), 'no more char')
---? end
+function test_rfind()
+  check_eq(I.rfind('abc', ''), 3, 'empty pattern')
+  check_eq(I.rfind('abc', 'c'), 3, 'final char')
+  check_eq(I.rfind('acbc', 'c', 3), 2, 'previous char')
+  check_nil(I.rfind('abc', 'd'), 'missing char')
+  check_nil(I.rfind('abc', 'c', 2), 'no more char')
+end
 
 -- helpers for selecting portions of text
 

main.lua

···
 local json = require 'json'
 
+require('test')
+
 OS = love.system.getOS()
 
 -- some global names accessible to Carousel
···
   if not edit.is_this_love_version_supported() then
     unsupported_version_screen_until_keypress()
   end
+
+  run_tests()
 
   love.keyboard.setKeyRepeat(true)
 

rects.lua

···
   local indent = 0
   if editor.indent_wrapped_lines then
     indent = editor.font:getWidth(line:match('^%s*'))
+    if indent > editor.width*0.5 then indent = 0 end
   end
   -- keep in sync with defs/*compute_rects_for_line
   for pos,char in my_utf8.chars(line, loc.pos) do
     local w = editor.font:getWidth(char)
-    local word_wrap = I.should_word_wrap(editor, line, pos, char, x)
-    if word_wrap
-        or x+w > editor.width  -- truncate within a word
-    then
+    local wrap = I.should_wrap(editor, line, pos, char, x, w)
+    if wrap then
       assert(pos > 1)
       local filler_rect = {x=x, y=y, dx=editor.width-x, dy=editor.line_height, pos=pos, show_cursor=true}
-      if word_wrap then
+      if wrap.word_wrap then
         -- draw word wrap indicator
         filler_rect.draw = {
           {type='circle', mode='line', fg={0.7,0.7,0.7}, x=x+5+2, y=y+editor.font_height-5, r=2},
···
   return editor.line_height
 end
 
--- Check whether to word-wrap line at pos which will be positioned at x.
+-- Check whether to wrap line before char at pos of width w, which will be
+-- positioned at x.
 --
--- We wrap at the start of a word (non-space just after space) if the word
--- (non-spaces followed by spaces) wouldn't fit in the rest of the line.
---
--- x lies between 0 and editor.width.
---
+-- Precondition:
+--  0 <= x <= editor.width
 -- Postcondition:
 --  Current line is not wider than editor.width
 --
 -- Desired properties in priority order:
 --  Next line doesn't start with whitespace
---  Current line ends with whitespace (a.k.a. word wrap)
 --  Current line is close to full
+--  Current line ends with whitespace (a.k.a. word wrap)
 -- None of these is guaranteed. But we should never satisfy a lower priority
 -- before a higher one.
-function I.should_word_wrap(editor, line, pos, char, x)
-  if char:match('%s') then return false end
-  if pos == 1 then return false end
-  if my_utf8.match_at(line, pos-1, '%S') then return false end
-  local offset = my_utf8.offset(line, pos)
-  -- most of the time a word is printable chars + whitespace
-  local s = line:match('%S+%s*', offset)
-  assert(s)
-  local w = editor.font:getWidth(s)
-  if x+w < editor.width then return false end
-  if w > editor.width then return false end  -- we're going to need to truncate the next word anyway
-  if x < 0.8*editor.width then
-    local s2 = line:match('%S+', offset)
-    local w2 = editor.font:getWidth(s2)
-    if x+w2 > editor.width then
-      -- there'll be some non-whitespace left over for the next line
-      return false
+function I.should_wrap(editor, line, pos, char, x, w)
+  assert(x <= editor.width)
+  if pos == 1 then return nil end
+  if x+w > editor.width then
+    -- return non-nil to ensure postcondition
+    return {word_wrap=my_utf8.match_at(line, pos-1, '%s') and char:match('%S')}
+  end
+  -- don't try to wrap short lines
+  if x < 0.8*editor.width then return nil end
+  if my_utf8.match_at(line, pos-1, '%s') and char:match('%S') then
+    -- at start of word
+    local offset = my_utf8.offset(line, pos)
+    local word_and_spaces = line:match('%S+%s*', offset)
+    local width_with_spaces = editor.font:getWidth(word_and_spaces)
+    if x+width_with_spaces > editor.width then
+      return {word_wrap=true}
+    end
+  elseif char:match('%S') then
+    -- in middle of word
+    local offset = my_utf8.offset(line, pos)
+    local word_and_spaces = line:match('%S+%s*', offset)
+    local width_with_spaces = editor.font:getWidth(word_and_spaces)
+    local word_no_space = line:match('%S+', offset)
+    local width_without_spaces = editor.font:getWidth(word_no_space)
+    -- ensure we don't start next line with spaces
+    if x+width_without_spaces < editor.width
+        and x+width_with_spaces > editor.width
+    then
+      return {word_wrap=nil}
     end
   end
-  return true
+  return nil
 end
 
 return rects

test.lua

···
+-- Some primitives for tests.
+
+function run_tests()
+  local sorted_names = {}
+  for name,binding in pairs(_G) do
+    if name:find('test_') == 1 then
+      table.insert(sorted_names, name)
+    end
+  end
+  table.sort(sorted_names)
+  Test_errors = {}
+  for _,name in ipairs(sorted_names) do
+    xpcall(_G[name], function(err) prepend_debug_info_to_test_failure(name, err) end)
+  end
+  if #Test_errors > 0 then
+    error(('There were %d test failures:\n%s'):format(#Test_errors, table.concat(Test_errors)))
+  end
+end
+
+function prepend_debug_info_to_test_failure(test_name, err)
+  local err_without_line_number = err:gsub('^[^:]*:[^:]*: ', '')
+  local stack_trace = debug.traceback('', --[[stack frame]]5)  -- most likely to be useful, but set to 0 for a complete stack trace
+  local file_and_line_number = stack_trace:gsub('stack traceback:\n', ''):gsub(': .*', '')
+  local full_error = file_and_line_number..':'..test_name..' -- '..err_without_line_number
+  -- uncomment this line for a complete stack trace
+--?   local full_error = file_and_line_number..':'..test_name..' -- '..err_without_line_number..'\t\t'..stack_trace:gsub('\n', '\n\t\t')
+  table.insert(Test_errors, full_error)
+end
+
+
+function check(x, msg)
+  if not x then
+    error(msg)
+  end
+end
+
+function check_nil(x, msg)
+  if x ~= nil then
+    error(msg..'; should be nil but got "'..x..'"')
+  end
+end
+
+function check_eq(x, expected, msg)
+  if not eq(x, expected) then
+    error(msg..'; should be "'..expected..'" but got "'..x..'"')
+  end
+end
+
+function eq(a, b)
+  if type(a) ~= type(b) then return false end
+  if type(a) == 'table' then
+    if #a ~= #b then return false end
+    for k, v in pairs(a) do
+      if not eq(b[k], v) then
+        return false
+      end
+    end
+    for k, v in pairs(b) do
+      if not eq(a[k], v) then
+        return false
+      end
+    end
+    return true
+  end
+  return a == b
+end