Merge pull request #54 from JoosepAlviste/fix-comment-nvim-multiline-…

…calculation
JoosepAlviste · Dec 30, 2022 · 4a42b30 · 4a42b30
2 parents 32d9627 + b17ed71
commit 4a42b30
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/lua/ts_context_commentstring/integrations/comment_nvim.lua b/lua/ts_context_commentstring/integrations/comment_nvim.lua
@@ -30,7 +30,10 @@ function M.create_pre_hook()
     -- Determine the location where to calculate commentstring from
     local location = nil
     if ctx.ctype == U.ctype.blockwise then
-      location = require('ts_context_commentstring.utils').get_cursor_location()
+      location = {
+        ctx.range.srow - 1,
+        ctx.range.scol,
+      }
     elseif ctx.cmotion == U.cmotion.v or ctx.cmotion == U.cmotion.V then
       location = require('ts_context_commentstring.utils').get_visual_start_location()
     end

diff --git a/lua/ts_context_commentstring/utils.lua b/lua/ts_context_commentstring/utils.lua
@@ -3,6 +3,8 @@ local fn = vim.fn
 
 local parsers = require 'nvim-treesitter.parsers'
 
+---Coordinates for a location. Both the line and the column are 0-indexed (e.g.,
+---line nr 10 is line 9, the first column is 0).
 ---@alias ts_context_commentstring.Location number[] 2-tuple of (line, column)
 
 local M = {}