Manual merge of into .

2021-11-23 15:57:22 -05:00
parent 955acf53a3 43a6e21135
commit 96db380c73
44 changed files with 2789 additions and 311 deletions
@@ -47,7 +47,7 @@ function Doc:reset_syntax()
  local syn = syntax.get(self.filename or "", header)
  if self.syntax ~= syn then
    self.syntax = syn
-    self.highlighter:reset()
+    self.highlighter:soft_reset()
  end
 end

@@ -62,12 +62,15 @@ function Doc:load(filename)
  local fp = assert( io.open(filename, "rb") )
  self:reset()
  self.lines = {}
+  local i = 1
  for line in fp:lines() do
    if line:byte(-1) == 13 then
      line = line:sub(1, -2)
      self.crlf = true
    end
    table.insert(self.lines, line .. "\n")
+    self.highlighter.lines[i] = false
+    i = i + 1
  end
  if #self.lines == 0 then
    table.insert(self.lines, "\n")
@@ -306,6 +309,7 @@ local function pop_undo(self, undo_stack, redo_stack, modified)
    self:raw_remove(line1, col1, line2, col2, redo_stack, cmd.time)
  elseif cmd.type == "selection" then
    self.selections = { table.unpack(cmd) }
+    self:sanitize_selection()
  end

  modified = modified or (cmd.type ~= "selection")