Merge branch 'main' into peek-folded

lua/ufo.lua

@@ -1,3 +1,5 @@
+local api = vim.api
+
 ---Export methods to the users, `require('ufo').method(...)`
 ---@class Ufo
 local M = {}
@@ -33,6 +35,7 @@ end
 ---Inspect ufo information by bufnr
 ---@param bufnr? number current buffer default
 function M.inspect(bufnr)
+    bufnr = bufnr or api.nvim_get_current_buf()
     local msg = require('ufo.main').inspectBuf(bufnr)
     if not msg then
         vim.notify(('Buffer %d has not been attached.'):format(bufnr), vim.log.levels.ERROR)

lua/ufo/fold.lua

@@ -115,6 +115,14 @@ function Fold.get(bufnr)
     return foldbuffer:get(bufnr)
 end
 
+function Fold.attach(bufnr)
+    foldbuffer.detachedBufSet[bufnr] = nil
+end
+
+function Fold.detach(bufnr)
+    foldbuffer.detachedBufSet[bufnr] = true
+end
+
 function Fold.setStatus(bufnr, status)
     local fb = foldbuffer:get(bufnr)
     local old = ''
@@ -147,6 +155,9 @@ end)()
 
 local function attach(bufnr)
     bufnr = bufnr or api.nvim_get_current_buf()
+    if foldbuffer.detachedBufSet[bufnr] then
+        return
+    end
     log.debug('attach bufnr:', bufnr)
     local fb = foldbuffer:get(bufnr)
     if fb then

lua/ufo/fold/buffer.lua

@@ -22,7 +22,8 @@ local FoldBuffer = {
     ns = nil,
     hlNs = nil,
     openFoldHlTimeout = 0,
-    pool = {}
+    pool = {},
+    detachedBufSet = {}
 }
 
 ---@class UfoFoldedLine

lua/ufo/lib/event.lua

@@ -1,4 +1,5 @@
 local disposable = require('ufo.lib.disposable')
+local log        = require('ufo.lib.log')
 
 ---@class UfoEvent
 local Event = {
@@ -48,6 +49,7 @@ function Event:emit(name, ...)
     if not listeners then
         return
     end
+    log.trace('event:', name, 'listeners:', listeners, 'args:', ...)
     for _, listener in ipairs(listeners) do
         listener(...)
     end

lua/ufo/main.lua

@@ -11,6 +11,8 @@ local event      = require('ufo.lib.event')
 local disposable = require('ufo.lib.disposable')
 
 local enabled
+
+---@type UfoDisposable[]
 local disposables = {}
 
 local function createEvents()
@@ -73,7 +75,7 @@ function M.disable()
     end
     deleteCommand()
     for _, item in ipairs(disposables) do
-        item:disable()
+        item:dispose()
     end
     enabled = false
     return true
@@ -99,6 +101,7 @@ end
 
 function M.attach(bufnr)
     bufnr = bufnr or api.nvim_get_current_buf()
+    fold.attach(bufnr)
     event:emit('BufEnter', bufnr)
 end
 
@@ -108,6 +111,7 @@ function M.detach(bufnr)
     if fb then
         fb:dispose()
     end
+    fold.detach(bufnr)
 end
 
 function M.enableFold(bufnr)

lua/ufo/provider.lua

@@ -34,10 +34,13 @@ end
 function Provider.requestFoldingRange(providers, bufnr)
     local main, fallback = providers[1], providers[2]
     local mainFunc = getFunction(main)
-    return promise.resolve(mainFunc(bufnr)):thenCall(function(value)
+
+    return promise(function(resolve)
+        resolve(mainFunc(bufnr))
+    end):thenCall(function(value)
         return {main, value}
     end, function(reason)
-        if reason == 'UfoFallbackException' then
+        if type(reason) == 'string' and reason:match('UfoFallbackException') then
             local fallbackFunc = getFunction(fallback)
             if fallbackFunc then
                 return {fallback, fallbackFunc(bufnr)}

lua/ufo/provider/lsp/nvim.lua

@@ -42,7 +42,6 @@ function NvimClient.requestFoldingRange(bufnr, kind)
             return
         end
         local bt = vim.bo[bufnr].bt
-        -- same behavior with coc.nvim
         if bt ~= '' and bt ~= 'acwrite' then
             return
         end

lua/ufo/provider/treesitter.lua

@@ -0,0 +1,111 @@
+local parsers = require('nvim-treesitter.parsers')
+local query = require('nvim-treesitter.query')
+local utils = require('ufo.utils')
+
+local Treesitter = {}
+
+local function prepare_query(bufnr, parser, queryName, root, rootLang)
+    if not root then
+        local firstTree = parser:trees()[1]
+        if firstTree then
+            root = firstTree:root()
+        else
+            return
+        end
+    end
+
+    local range = {root:range()}
+
+    if not rootLang then
+        local langTree = parser:language_for_range(range)
+        if langTree then
+            rootLang = langTree:lang()
+        else
+            return
+        end
+    end
+
+    return query.get_query(rootLang, queryName), {
+      root = root,
+      source = bufnr,
+      start = range[1],
+      -- The end row is exclusive so we need to add 1 to it.
+      stop = range[3] + 1,
+    }
+end
+
+local function iterFoldMatches(bufnr, parser, root, rootLang)
+    local q, p = prepare_query(bufnr, parser, 'folds', root, rootLang)
+    if not q then
+        return function() end
+    end
+    local iter = q:iter_matches(p.root, p.source, p.start, p.stop)
+    return function()
+        local pattern, match = iter()
+        local matches = {}
+        if pattern == nil then
+            return pattern
+        end
+        for id, node in ipairs(match) do
+            local name = q.captures[id] -- name of the capture in the query
+            if name then
+                table.insert(matches, node)
+            end
+        end
+        return matches
+    end
+end
+
+local function getFoldMatches(res, bufnr, parser, root, lang)
+    for matches in iterFoldMatches(bufnr, parser, root, lang) do
+        for _, node in ipairs(matches) do
+            table.insert(res, node)
+        end
+    end
+    return res
+end
+
+local function getCpatureMatchesRecursively(bufnr, parser)
+    local noQuery = true
+    local res = {}
+    parser:for_each_tree(function(tree, langTree)
+        local lang = langTree:lang()
+        if query.has_folds(lang) then
+            noQuery = false
+            getFoldMatches(res, bufnr, parser, tree:root(), lang)
+        end
+    end)
+    if noQuery then
+        error('UfoFallbackException')
+    end
+    return res
+end
+
+function Treesitter.getFolds(bufnr)
+    if not utils.isBufLoaded(bufnr) then
+        return
+    end
+    local bt = vim.bo[bufnr].bt
+    if bt ~= '' and bt ~= 'acwrite' then
+        return
+    end
+    local parser = parsers.get_parser(bufnr)
+    if not parser then
+        error('UfoFallbackException')
+    end
+
+    local ranges = {}
+    local matches = getCpatureMatchesRecursively(bufnr, parser)
+    for _, node in ipairs(matches) do
+        local start, _, stop, stop_col = node:range()
+        if stop_col == 0 then
+            stop = stop - 1
+        end
+        if stop > start then
+            table.insert(ranges, {startLine = start, endLine = stop})
+        end
+    end
+    return ranges
+end
+
+return Treesitter