From 3d49b6d2004f96a9557ecdef02d4dfac50f712e4 Mon Sep 17 00:00:00 2001
From: rxi <rxi@users.noreply.github.com>
Date: Sat, 9 May 2020 16:23:07 +0100
Subject: [PATCH] Fixed highlighter resetting of syntax on doc filename change

---
 data/core/doc/highlighter.lua | 10 +++++++---
 data/core/doc/init.lua        |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/data/core/doc/highlighter.lua b/data/core/doc/highlighter.lua
index 5a066ecb..6a3237ff 100644
--- a/data/core/doc/highlighter.lua
+++ b/data/core/doc/highlighter.lua
@@ -9,9 +9,7 @@ local Highlighter = Object:extend()
 
 function Highlighter:new(doc)
   self.doc = doc
-  self.lines = {}
-  self.first_invalid_line = 1
-  self.max_wanted_line = 0
+  self:reset()
 
   -- init incremental syntax highlighting
   core.add_thread(function()
@@ -40,6 +38,12 @@ function Highlighter:new(doc)
 end
 
 
+function Highlighter:reset()
+  self.lines = {}
+  self.first_invalid_line = 1
+  self.max_wanted_line = 0
+end
+
 function Highlighter:invalidate(idx)
   self.first_invalid_line = idx
   self.max_wanted_line = math.min(self.max_wanted_line, #self.doc.lines)
diff --git a/data/core/doc/init.lua b/data/core/doc/init.lua
index 0000ead3..9d4d2c02 100644
--- a/data/core/doc/init.lua
+++ b/data/core/doc/init.lua
@@ -59,7 +59,7 @@ function Doc:reset_syntax()
   local syn = syntax.get(self.filename or "")
   if self.syntax ~= syn then
     self.syntax = syn
-    self.highlighter:invalidate(1)
+    self.highlighter:reset()
   end
 end