From a9162ae711c278affff6b029219c1cb591eeb558 Mon Sep 17 00:00:00 2001
From: Danielkonge <dakongsgaard@gmail.com>
Date: Fri, 15 Dec 2023 13:11:06 +0100
Subject: [PATCH] fix: move some scope calculations out of main loop

---
 lua/ibl/config.lua |  2 +-
 lua/ibl/init.lua   | 62 ++++++++++++++++++++++++++++++++++++----------
 2 files changed, 50 insertions(+), 14 deletions(-)

diff --git a/lua/ibl/config.lua b/lua/ibl/config.lua
index fd7ad7f2..54da9dbe 100644
--- a/lua/ibl/config.lua
+++ b/lua/ibl/config.lua
@@ -21,7 +21,7 @@ M.default_config = {
     debounce = 200,
     viewport_buffer = {
         min = 30,
-        max = 500,
+        max = 60,
     },
     indent = {
         char = "▎",
diff --git a/lua/ibl/init.lua b/lua/ibl/init.lua
index 4c20747f..a5df7829 100644
--- a/lua/ibl/init.lua
+++ b/lua/ibl/init.lua
@@ -187,10 +187,15 @@ M.refresh = function(bufnr)
     end
 
     local scope
+    local scope_start_line, scope_end_line
     if not scope_disabled and config.scope.enabled then
         scope = scp.get(bufnr, config)
         if scope and scope:start() >= 0 then
-            offset = top_offset - math.min(top_offset - math.min(offset, scope:start()), config.viewport_buffer.max)
+            local scope_start = scope:start()
+            local scope_end = scope:end_()
+            offset = top_offset - math.min(top_offset - math.min(offset, scope_start), config.viewport_buffer.max)
+            scope_start_line = vim.api.nvim_buf_get_lines(bufnr, scope_start, scope_start + 1, false)
+            scope_end_line = vim.api.nvim_buf_get_lines(bufnr, scope_end, scope_end + 1, false)
         end
     end
 
@@ -260,6 +265,49 @@ M.refresh = function(bufnr)
         end
     end
 
+    if scope and scope_start_line then
+        -- find whitespace tables for the start and end lines of scope
+        local whitespace_start = utils.get_whitespace(scope_start_line[1])
+        local whitespace_end = utils.get_whitespace(scope_end_line[1])
+        local whitespace_tbl_start = indent.get(whitespace_start, indent_opts, nil)
+        local whitespace_tbl_end = indent.get(whitespace_end, indent_opts, nil)
+        local whitespace, whitespace_tbl
+        -- use the smallest whitespace table of the two to determine the scope index
+        if #whitespace_tbl_end < #whitespace_tbl_start then
+            whitespace = whitespace_end
+            whitespace_tbl = whitespace_tbl_end
+        else
+            whitespace = whitespace_start
+            whitespace_tbl = whitespace_tbl_start
+        end
+
+        -- do the same calculations as in the main loop below, but note that the scope
+        -- start and end will never be on a blankline, so these cases simplify a lot
+        local current_left_offset = left_offset
+        while #whitespace_tbl > 0 and current_left_offset > 0 do
+            table.remove(whitespace_tbl, 1)
+            current_left_offset = current_left_offset - 1
+        end
+
+        for _, fn in
+            pairs(hooks.get(bufnr, hooks.type.WHITESPACE) --[=[@as ibl.hooks.cb.whitespace[]]=])
+        do
+            whitespace_tbl = fn(buffer_state.tick, bufnr, scope_row_start - 1, whitespace_tbl)
+        end
+
+        -- calculate the scope index
+        scope_col_start = #whitespace
+        scope_col_start_single = #whitespace_tbl
+        scope_index = #utils.tbl_filter(function(w)
+            return indent.is_indent(w)
+        end, whitespace_tbl) + 1
+        for _, fn in
+            pairs(hooks.get(bufnr, hooks.type.SCOPE_HIGHLIGHT) --[=[@as ibl.hooks.cb.scope_highlight[]]=])
+        do
+            scope_index = fn(buffer_state.tick, bufnr, scope, scope_index)
+        end
+    end
+
     for i, line in ipairs(lines) do
         local row = i + offset
         if line_skipped[i] then
@@ -375,18 +423,6 @@ M.refresh = function(bufnr)
         -- #### make virtual text ####
         local scope_start = row == scope_row_start
         local scope_end = row == scope_row_end
-        if scope_start and scope then
-            scope_col_start = #whitespace
-            scope_col_start_single = #whitespace_tbl
-            scope_index = #utils.tbl_filter(function(w)
-                return indent.is_indent(w)
-            end, whitespace_tbl) + 1
-            for _, fn in
-                pairs(hooks.get(bufnr, hooks.type.SCOPE_HIGHLIGHT) --[=[@as ibl.hooks.cb.scope_highlight[]]=])
-            do
-                scope_index = fn(buffer_state.tick, bufnr, scope, scope_index)
-            end
-        end
 
         local whitespace_only = not blankline and line == whitespace
         local char_map = vt.get_char_map(config, listchars, whitespace_only, blankline)