Enable cache only during `update`, `draw` and `on_mouse_move`

Also moved cache to `DocView`

data/core/docview.lua

@@ -56,6 +56,7 @@ function DocView:new(doc)
   self.doc = assert(doc)
   self.font = "code_font"
   self.last_x_offset = {}
+  self.step_cache = {}
 end
 
 
@@ -98,14 +99,22 @@ end
 
 
 function DocView:get_scrollable_size()
-  return self:get_line_height() * (#self.doc.lines - 1) + self.size.y
+  if self.step_cache.enabled and self.step_cache.scrollable_size ~= nil then
+    return self.step_cache.scrollable_size
+  end
+  self.step_cache.scrollable_size = self:get_line_height() * (#self.doc.lines - 1) + self.size.y
+  return self.step_cache.scrollable_size
 end
 
 function DocView:get_h_scrollable_size()
+  if self.step_cache.enabled and self.step_cache.h_scrollable_size ~= nil then
+    return self.step_cache.h_scrollable_size
+  end
   local xmargin = 3 * self:get_font():get_width(' ') -- from DocView:scroll_to_make_visible
   local long_line = next(self.doc.long_lines.line_numbers) or 1
-  return self:get_col_x_offset(long_line, self.doc.long_lines.length)
+  self.step_cache.h_scrollable_size = self:get_col_x_offset(long_line, self.doc.long_lines.length)
                                       + self:get_gutter_width() + xmargin
+  return self.step_cache.h_scrollable_size
 end
 
 function DocView:get_font()
@@ -276,6 +285,7 @@ end
 
 
 function DocView:on_mouse_moved(x, y, ...)
+  self.step_cache.enabled = true
   DocView.super.on_mouse_moved(self, x, y, ...)
 
   if self:scrollbar_overlaps_point(x, y) or self.dragging_scrollbar
@@ -299,6 +309,7 @@ function DocView:on_mouse_moved(x, y, ...)
       self.doc:set_selection(mouse_selection(self.doc, clicks, l1, c1, l2, c2))
     end
   end
+  self.step_cache.enabled = false
 end
 
 
@@ -312,8 +323,14 @@ function DocView:on_text_input(text)
   self.doc:text_input(text)
 end
 
+function DocView:invalidate_step_cache()
+  self.step_cache.scrollable_size = nil
+  self.step_cache.h_scrollable_size = nil
+end
 
 function DocView:update()
+  self:invalidate_step_cache()
+  self.step_cache.enabled = true
   -- scroll to make caret visible and reset blink timer if it moved
   local line, col = self.doc:get_selection()
   if (line ~= self.last_line or col ~= self.last_col) and self.size.x > 0 then
@@ -335,6 +352,7 @@ function DocView:update()
   end
 
   DocView.super.update(self)
+  self.step_cache.enabled = false
 end
 
 
@@ -425,6 +443,7 @@ function DocView:draw_overlay()
 end
 
 function DocView:draw()
+  self.step_cache.enabled = true
   self:draw_background(style.background)
 
   self:get_font():set_tab_size(config.indent_size)
@@ -451,6 +470,7 @@ function DocView:draw()
 
   self:draw_scrollbar()
   self:draw_h_scrollbar()
+  self.step_cache.enabled = false
 end
 
 

data/core/view.lua

@@ -19,10 +19,9 @@ function View:new()
   self.scroll = { x = 0, y = 0, to = { x = 0, y = 0 } }
   self.cursor = "arrow"
   self.scrollable = false
-  self.h_scrollable_size = 0
-  self.scrollable_size = math.huge
 end
 
+
 function View:move_towards(t, k, dest, rate)
   if type(t) ~= "table" then
     return self:move_towards(self, t, k, dest, rate)
@@ -65,7 +64,7 @@ end
 
 
 function View:get_scrollbar_rect()
-  local sz = self.scrollable_size
+  local sz = self:get_scrollable_size()
   if sz <= self.size.y or sz == math.huge then
     return 0, 0, 0, 0
   end
@@ -79,7 +78,7 @@ end
 
 
 function View:get_h_scrollbar_rect()
-  local sz = self.h_scrollable_size
+  local sz = self:get_h_scrollable_size()
   if sz <= self.size.x or sz == math.huge then
     return 0, 0, 0, 0
   end
@@ -123,10 +122,10 @@ end
 
 function View:on_mouse_moved(x, y, dx, dy)
   if self.dragging_scrollbar then
-    local delta = self.scrollable_size / self.size.y * dy
+    local delta = self:get_scrollable_size() / self.size.y * dy
     self.scroll.to.y = self.scroll.to.y + delta
   elseif self.dragging_h_scrollbar then
-    local delta = self.h_scrollable_size / self.size.x * dx
+    local delta = self:get_h_scrollable_size() / self.size.x * dx
     self.scroll.to.x = self.scroll.to.x + delta
   end
   self.hovered_scrollbar = self:scrollbar_overlaps_point(x, y)
@@ -165,16 +164,14 @@ end
 
 
 function View:clamp_scroll_position()
-  local max_x = self.h_scrollable_size - self.size.x
+  local max_x = self:get_h_scrollable_size() - self.size.x
-  local max_y = self.scrollable_size - self.size.y
+  local max_y = self:get_scrollable_size() - self.size.y
   self.scroll.to.x = common.clamp(self.scroll.to.x, 0, max_x)
   self.scroll.to.y = common.clamp(self.scroll.to.y, 0, max_y)
 end
 
 
 function View:update()
-  self.scrollable_size = self:get_scrollable_size()
-  self.h_scrollable_size = self:get_h_scrollable_size()
   self:clamp_scroll_position()
   self:move_towards(self.scroll, "x", self.scroll.to.x, 0.3)
   self:move_towards(self.scroll, "y", self.scroll.to.y, 0.3)