Improved behaviour of and renamed translate.next|previous_word_boundary

2020-05-28 11:57:53 +01:00
parent 74755f5b4a
commit 9c652086e8
3 changed files with 29 additions and 30 deletions
@@ -28,33 +28,32 @@ function translate.next_char(doc, line, col)
 end


-function translate.previous_word_boundary(doc, line, col)
-  local char = doc:get_char(doc:position_offset(line, col, -1))
-  local inword = not is_non_word(char)
-  repeat
-    local line2, col2 = line, col
-    line, col = doc:position_offset(line, col, -1)
-    if line == line2 and col == col2 then
+function translate.previous_word_start(doc, line, col)
+  local prev
+  while line > 1 or col > 1 do
+    local l, c = doc:position_offset(line, col, -1)
+    local char = doc:get_char(l, c)
+    if prev and prev ~= char or not is_non_word(char) then
      break
    end
-    local c = doc:get_char(doc:position_offset(line, col, -1))
-  until inword and is_non_word(c) or not inword and c ~= char
-  return line, col
+    prev, line, col = char, l, c
+  end
+  return translate.start_of_word(doc, line, col)
 end


-function translate.next_word_boundary(doc, line, col)
-  local char = doc:get_char(line, col)
-  local inword = not is_non_word(char)
-  repeat
-    local line2, col2 = line, col
-    line, col = doc:position_offset(line, col, 1)
-    if line == line2 and col == col2 then
+function translate.next_word_end(doc, line, col)
+  local prev
+  local end_line, end_col = translate.end_of_doc(doc, line, col)
+  while line < end_line or col < end_col do
+    local char = doc:get_char(line, col)
+    if prev and prev ~= char or not is_non_word(char) then
      break
    end
-    local c = doc:get_char(line, col)
-  until inword and is_non_word(c) or not inword and c ~= char
-  return line, col
+    line, col = doc:position_offset(line, col, 1)
+    prev = char
+  end
+  return translate.end_of_word(doc, line, col)
 end