Merge branch 'main' into count_motions

README.md

@@ -20,6 +20,7 @@ return {
     config = {
     -- startVisible = true,
     -- showBlankVirtLine = true,
+    -- highlightColor = "Comment",
     -- hints = {
     --      Caret = { text = "^", prio = 2 },
     --      Dollar = { text = "$", prio = 1 },

lua/precognition/init.lua

@@ -28,12 +28,14 @@ local M = {}
 ---@class Precognition.Config
 ---@field startVisible boolean
 ---@field showBlankVirtLine boolean
+---@field highlightColor string
 ---@field hints Precognition.HintConfig
 ---@field gutterHints Precognition.GutterHintConfig
 
 ---@class Precognition.PartialConfig
 ---@field startVisible? boolean
 ---@field showBlankVirtLine? boolean
+---@field highlightColor? string
 ---@field hints? Precognition.HintConfig
 ---@field gutterHints? Precognition.GutterHintConfig
 
@@ -70,6 +72,7 @@ local defaultHintConfig = {
 local default = {
     startVisible = true,
     showBlankVirtLine = true,
+    highlightColor = "Comment",
     hints = defaultHintConfig,
     gutterHints = {
         --prio is not currentlt used for gutter hints
@@ -142,7 +145,7 @@ local function build_virt_line(marks, line_len)
     if line:match("^%s+$") then
         return {}
     end
-    table.insert(virt_line, { line, "Comment" })
+    table.insert(virt_line, { line, config.highlightColor })
     return virt_line
 end
 
@@ -174,7 +177,7 @@ local function apply_gutter_hints(gutter_hints, bufnr)
             end
             vim.fn.sign_define(gutter_name_prefix .. hint, {
                 text = config.gutterHints[hint].text,
-                texthl = "Comment",
+                texthl = config.highlightColor,
             })
             local ok, res = pcall(vim.fn.sign_place, 0, gutter_group, gutter_name_prefix .. hint, bufnr, {
                 lnum = loc,

lua/precognition/utils.lua

@@ -11,7 +11,7 @@ M.char_classes = {
 ---@param big_word boolean
 ---@return integer
 function M.char_class(char, big_word)
-    big_word = big_word or false
+    assert(type(big_word) == "boolean", "big_word must be a boolean")
     local cc = M.char_classes
     local byte = string.byte(char)
 

lua/precognition/vertical_motions.lua

@@ -24,15 +24,15 @@ function M.next_paragraph_line(bufnr)
         local cursorline, _ = unpack(vim.api.nvim_win_get_cursor(0))
         while not found and cursorline < visibleline do
             local cursorlinecontent = buffcontent[cursorline]
-            while cursorline < visibleline and cursorlinecontent:match("^%s*$") do
+            while cursorline < visibleline and cursorlinecontent:match("^[\n\r]*$") do
                 cursorline = cursorline + 1
                 cursorlinecontent = buffcontent[cursorline]
             end
             -- find next blank line below
             while cursorline < visibleline and not found do
                 cursorline = cursorline + 1
                 cursorlinecontent = buffcontent[cursorline]
-                if cursorlinecontent:match("^%s*$") then
+                if cursorlinecontent:match("^[\n\r]*$") then
                     found = true
                 end
             end
@@ -54,15 +54,15 @@ function M.prev_paragraph_line(bufnr)
         local cursorline, _ = unpack(vim.api.nvim_win_get_cursor(0))
         while not found and cursorline > visibleline do
             local cursorlinecontent = buffcontent[cursorline]
-            while cursorline > visibleline and cursorlinecontent:match("^%s*$") do
+            while cursorline > visibleline and cursorlinecontent:match("^[\n\r]*$") do
                 cursorline = cursorline - 1
                 cursorlinecontent = buffcontent[cursorline]
             end
             -- find next blank line above
             while cursorline > visibleline and not found do
                 cursorline = cursorline - 1
                 cursorlinecontent = buffcontent[cursorline]
-                if cursorlinecontent:match("^%s*$") then
+                if cursorlinecontent:match("^[\n\r]*$") then
                     found = true
                 end
             end

tests/precognition/e2e_spec.lua

@@ -29,13 +29,14 @@ describe("e2e tests", function()
         eq(7, vim.tbl_count(autocmds))
     end)
 
-    -- 0.1 onlu?
+    -- 0.1 only
     -- it("namespace is created", function()
     --     local ns = vim.api.nvim_get_namespaces()
     --
     --     eq(1, ns["precognition"])
     --     eq(2, ns["precognition_gutter"])
     -- :end)
+    -- end)
     --
     it("virtual line is displayed and updated", function()
         local buffer = vim.api.nvim_create_buf(true, false)
@@ -59,12 +60,16 @@ describe("e2e tests", function()
 
         for _, extmark in pairs(gutter_extmarks) do
             if extmark[4].sign_text == "G " then
+                eq("Comment", extmark[4].sign_hl_group)
                 eq(5, extmark[2])
             elseif extmark[4].sign_text == "gg" then
+                eq("Comment", extmark[4].sign_hl_group)
                 eq(0, extmark[2])
             elseif extmark[4].sign_text == "{ " then
+                eq("Comment", extmark[4].sign_hl_group)
                 eq(0, extmark[2])
             elseif extmark[4].sign_text == "} " then
+                eq("Comment", extmark[4].sign_hl_group)
                 eq(2, extmark[2])
             else
                 assert(false, "unexpected sign text")
@@ -73,6 +78,7 @@ describe("e2e tests", function()
 
         eq(vim.api.nvim_win_get_cursor(0)[1] - 1, extmarks[1])
         eq("b   e w                  $", extmarks[3].virt_lines[1][1][1])
+        eq("Comment", extmarks[3].virt_lines[1][1][2])
 
         vim.api.nvim_win_set_cursor(0, { 1, 6 })
         precognition.on_cursor_moved()
@@ -148,4 +154,48 @@ describe("e2e tests", function()
             end
         end
     end)
+
+    it("virtual line text color can be customised", function()
+        precognition.setup({ highlightColor = "Function" })
+        local buffer = vim.api.nvim_create_buf(true, false)
+        vim.api.nvim_set_current_buf(buffer)
+        vim.api.nvim_buf_set_lines(
+            buffer,
+            0,
+            -1,
+            false,
+            { "Hello World this is a test", "line 2", "", "line 4", "", "line 6" }
+        )
+        vim.api.nvim_win_set_cursor(0, { 1, 1 })
+
+        precognition.on_cursor_moved()
+
+        local extmarks = vim.api.nvim_buf_get_extmark_by_id(buffer, precognition.ns, precognition.extmark, {
+            details = true,
+        })
+
+        local gutter_extmarks = get_gutter_extmarks(buffer)
+
+        for _, extmark in pairs(gutter_extmarks) do
+            if extmark[4].sign_text == "G " then
+                eq("Function", extmark[4].sign_hl_group)
+                eq(5, extmark[2])
+            elseif extmark[4].sign_text == "gg" then
+                eq("Function", extmark[4].sign_hl_group)
+                eq(0, extmark[2])
+            elseif extmark[4].sign_text == "{ " then
+                eq("Function", extmark[4].sign_hl_group)
+                eq(0, extmark[2])
+            elseif extmark[4].sign_text == "} " then
+                eq("Function", extmark[4].sign_hl_group)
+                eq(2, extmark[2])
+            else
+                assert(false, "unexpected sign text")
+            end
+        end
+
+        eq(vim.api.nvim_win_get_cursor(0)[1] - 1, extmarks[1])
+        eq("b   e w                  $", extmarks[3].virt_lines[1][1][1])
+        eq("Function", extmarks[3].virt_lines[1][1][2])
+    end)
 end)