From eb37241d38ad35b9e6bfac6379dd10e60aa0350c Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Sun, 26 May 2024 10:27:12 -0700
Subject: fix(tohtml): properly handle multiple hl groups #29012

Problem: :TOhtml doesn't properly handle virtual text when it has
multiple highlight groups. It also improperly calculates position offset
for multi-byte virt_text characters.

Solution: Apply the `vim.api.nvim_strwidth` broadly to properly
calculate character offset, and handle the cases where the `hl` argument
can be a table of multiple hl groups.
---
 test/functional/plugin/tohtml_spec.lua | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'test/functional/plugin/tohtml_spec.lua')

diff --git a/test/functional/plugin/tohtml_spec.lua b/test/functional/plugin/tohtml_spec.lua
index 200a5f34b2..be5bada901 100644
--- a/test/functional/plugin/tohtml_spec.lua
+++ b/test/functional/plugin/tohtml_spec.lua
@@ -287,7 +287,13 @@ describe(':TOhtml', function()
         0,
         { virt_text = { { 'foo' } }, virt_text_pos = 'overlay' }
       )
-      api.nvim_buf_set_extmark(0, ns, 2, 0, { virt_text = { { 'foo' } }, virt_text_pos = 'inline' })
+      api.nvim_buf_set_extmark(
+        0,
+        ns,
+        2,
+        0,
+        { virt_text = { { 'fo┊o', { 'Conceal', 'Comment' } } }, virt_text_pos = 'inline' }
+      )
       --api.nvim_buf_set_extmark(0,ns,3,0,{virt_text={{'foo'}},virt_text_pos='right_align'})
       run_tohtml_and_assert(screen)
     end)
-- 
cgit 


From 118ae7e5ed6cfab6a49ec70c21da2b850161289c Mon Sep 17 00:00:00 2001
From: altermo <107814000+altermo@users.noreply.github.com>
Date: Thu, 11 Jul 2024 18:16:51 +0200
Subject: fix(tohtml): support ranges again

---
 test/functional/plugin/tohtml_spec.lua | 38 ++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

(limited to 'test/functional/plugin/tohtml_spec.lua')

diff --git a/test/functional/plugin/tohtml_spec.lua b/test/functional/plugin/tohtml_spec.lua
index be5bada901..827db8c0f3 100644
--- a/test/functional/plugin/tohtml_spec.lua
+++ b/test/functional/plugin/tohtml_spec.lua
@@ -176,6 +176,44 @@ describe(':TOhtml', function()
     }, fn.readfile(out_file))
   end)
 
+  it('expected internal html generated from range', function()
+    insert([[
+    line1
+    line2
+    line3
+    ]])
+    local ns = api.nvim_create_namespace ''
+    api.nvim_buf_set_extmark(0, ns, 0, 0, { end_col = 1, end_row = 1, hl_group = 'Visual' })
+    exec('set termguicolors')
+    local bg = fn.synIDattr(fn.hlID('Normal'), 'bg#', 'gui')
+    local fg = fn.synIDattr(fn.hlID('Normal'), 'fg#', 'gui')
+    exec_lua [[
+    local html = vim.cmd'2,2TOhtml'
+    ]]
+    local out_file = api.nvim_buf_get_name(api.nvim_get_current_buf())
+    eq({
+      '<!DOCTYPE html>',
+      '<html>',
+      '<head>',
+      '<meta charset="UTF-8">',
+      '<title></title>',
+      ('<meta name="colorscheme" content="%s"></meta>'):format(api.nvim_get_var('colors_name')),
+      '<style>',
+      '* {font-family: monospace}',
+      ('body {background-color: %s; color: %s}'):format(bg, fg),
+      '.Visual {background-color: #9b9ea4}',
+      '</style>',
+      '</head>',
+      '<body style="display: flex">',
+      '<pre><span class="Visual">',
+      'l</span>ine2',
+      '',
+      '</pre>',
+      '</body>',
+      '</html>',
+    }, fn.readfile(out_file))
+  end)
+
   it('highlight attributes generated', function()
     --Make sure to uncomment the attribute in `html_syntax_match()`
     exec('hi LINE gui=' .. table.concat({
-- 
cgit 


From 59baa5e8a1f9e71b82f28c2723ccc558370b6fc0 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Thu, 29 Aug 2024 09:36:33 -0700
Subject: fix(tohtml): apply sp color if present #30110

Problem:
Things like underlines are always given a default foreground highlight
regardless of the value of `sp`.

Solution:
Check for `sp` first, and apply that color to the text decoration color if it
exists.

Limitations:
If there is no value of `sp`, vim applies a text decoration color that matches
the foreground of the text. This is still not implemented (and seems like a much
more complex problem): in TOhtml, the underline will still be given a default
foreground highlight.
---
 test/functional/plugin/tohtml_spec.lua | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'test/functional/plugin/tohtml_spec.lua')

diff --git a/test/functional/plugin/tohtml_spec.lua b/test/functional/plugin/tohtml_spec.lua
index 827db8c0f3..dbf385c0c3 100644
--- a/test/functional/plugin/tohtml_spec.lua
+++ b/test/functional/plugin/tohtml_spec.lua
@@ -33,6 +33,10 @@ local function html_syntax_match()
       attr.underline = nil
       attr.undercurl = true
     end
+    attr.sp = style:match('text%-decoration%-color: #(%x+)')
+    if attr.sp then
+      attr.sp = tonumber(attr.sp, 16)
+    end
     attr.bg = style:match('background%-color: #(%x+)')
     if attr.bg then
       attr.bg = tonumber(attr.bg, 16)
@@ -49,7 +53,7 @@ local function html_syntax_match()
   local whitelist = {
     'fg',
     'bg',
-    --'sp',
+    'sp',
     --'blend',
     'bold',
     --'standout',
@@ -216,7 +220,7 @@ describe(':TOhtml', function()
 
   it('highlight attributes generated', function()
     --Make sure to uncomment the attribute in `html_syntax_match()`
-    exec('hi LINE gui=' .. table.concat({
+    exec('hi LINE guisp=#00ff00 gui=' .. table.concat({
       'bold',
       'underline',
       'italic',
-- 
cgit 


From e37404f7fecc5f57e4f3df4cf5ba0adec67bfbb3 Mon Sep 17 00:00:00 2001
From: yayoyuyu <112897090+yayoyuyu@users.noreply.github.com>
Date: Tue, 20 Aug 2024 23:29:27 +0900
Subject: fix(tohtml): enclose font-family names in quotation marks

Font-family names must be enclosed in quotation marks to ensure that
fonts are applied correctly when there are spaces in the name.

Fix an issue where multiple fonts specified in `vim.o.guifont` are
inserted as a single element, treating them as a single font.

Support for escaping commas with backslash and ignoring spaces
after a comma.

ref `:help 'guifont'`
---
 test/functional/plugin/tohtml_spec.lua | 85 +++++++++++++++++++++-------------
 1 file changed, 53 insertions(+), 32 deletions(-)

(limited to 'test/functional/plugin/tohtml_spec.lua')

diff --git a/test/functional/plugin/tohtml_spec.lua b/test/functional/plugin/tohtml_spec.lua
index dbf385c0c3..8cb7105660 100644
--- a/test/functional/plugin/tohtml_spec.lua
+++ b/test/functional/plugin/tohtml_spec.lua
@@ -136,6 +136,53 @@ local function run_tohtml_and_assert(screen, func)
   screen:expect({ grid = expected.grid, attr_ids = expected.attr_ids })
 end
 
+---@param guifont boolean
+local function test_generates_html(guifont)
+  insert([[line]])
+  exec('set termguicolors')
+  local bg = fn.synIDattr(fn.hlID('Normal'), 'bg#', 'gui')
+  local fg = fn.synIDattr(fn.hlID('Normal'), 'fg#', 'gui')
+  if guifont then
+    exec_lua [[
+      vim.o.guifont="Font,Escape\\,comma, Ignore space after comma"
+      local outfile = vim.fn.tempname() .. '.html'
+      local html = require('tohtml').tohtml(0,{title="title"})
+      vim.fn.writefile(html, outfile)
+      vim.cmd.split(outfile)
+    ]]
+  else
+    exec_lua [[
+      local outfile = vim.fn.tempname() .. '.html'
+      local html = require('tohtml').tohtml(0,{title="title",font={ "dumyfont","anotherfont" }})
+      vim.fn.writefile(html, outfile)
+      vim.cmd.split(outfile)
+    ]]
+  end
+  local out_file = api.nvim_buf_get_name(api.nvim_get_current_buf())
+  eq({
+    '<!DOCTYPE html>',
+    '<html>',
+    '<head>',
+    '<meta charset="UTF-8">',
+    '<title>title</title>',
+    ('<meta name="colorscheme" content="%s"></meta>'):format(api.nvim_get_var('colors_name')),
+    '<style>',
+    ('* {font-family: %s,monospace}'):format(
+      guifont and '"Font","Escape,comma","Ignore space after comma"' or '"dumyfont","anotherfont"'
+    ),
+    ('body {background-color: %s; color: %s}'):format(bg, fg),
+    '</style>',
+    '</head>',
+    '<body style="display: flex">',
+    '<pre>',
+    'line',
+    '',
+    '</pre>',
+    '</body>',
+    '</html>',
+  }, fn.readfile(out_file))
+end
+
 describe(':TOhtml', function()
   --- @type test.functional.ui.screen
   local screen
@@ -146,38 +193,12 @@ describe(':TOhtml', function()
     exec('colorscheme default')
   end)
 
-  it('expected internal html generated', function()
-    insert([[line]])
-    exec('set termguicolors')
-    local bg = fn.synIDattr(fn.hlID('Normal'), 'bg#', 'gui')
-    local fg = fn.synIDattr(fn.hlID('Normal'), 'fg#', 'gui')
-    exec_lua [[
-    local outfile = vim.fn.tempname() .. '.html'
-    local html = require('tohtml').tohtml(0,{title="title",font="dumyfont"})
-    vim.fn.writefile(html, outfile)
-    vim.cmd.split(outfile)
-    ]]
-    local out_file = api.nvim_buf_get_name(api.nvim_get_current_buf())
-    eq({
-      '<!DOCTYPE html>',
-      '<html>',
-      '<head>',
-      '<meta charset="UTF-8">',
-      '<title>title</title>',
-      ('<meta name="colorscheme" content="%s"></meta>'):format(api.nvim_get_var('colors_name')),
-      '<style>',
-      '* {font-family: dumyfont,monospace}',
-      ('body {background-color: %s; color: %s}'):format(bg, fg),
-      '</style>',
-      '</head>',
-      '<body style="display: flex">',
-      '<pre>',
-      'line',
-      '',
-      '</pre>',
-      '</body>',
-      '</html>',
-    }, fn.readfile(out_file))
+  it('generates html', function()
+    test_generates_html(false)
+  end)
+
+  it("generates html, respects 'guifont'", function()
+    test_generates_html(true)
   end)
 
   it('expected internal html generated from range', function()
-- 
cgit 


From 95b65a7554f1b1041e4f1e7427e540993b68e47e Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Sun, 8 Sep 2024 12:15:13 +0200
Subject: test(tohtml): simplify font test

---
 test/functional/plugin/tohtml_spec.lua | 48 ++++++++++++++++------------------
 1 file changed, 23 insertions(+), 25 deletions(-)

(limited to 'test/functional/plugin/tohtml_spec.lua')

diff --git a/test/functional/plugin/tohtml_spec.lua b/test/functional/plugin/tohtml_spec.lua
index 8cb7105660..98a422935c 100644
--- a/test/functional/plugin/tohtml_spec.lua
+++ b/test/functional/plugin/tohtml_spec.lua
@@ -137,27 +137,26 @@ local function run_tohtml_and_assert(screen, func)
 end
 
 ---@param guifont boolean
-local function test_generates_html(guifont)
+local function test_generates_html(guifont, expect_font)
   insert([[line]])
   exec('set termguicolors')
   local bg = fn.synIDattr(fn.hlID('Normal'), 'bg#', 'gui')
   local fg = fn.synIDattr(fn.hlID('Normal'), 'fg#', 'gui')
-  if guifont then
-    exec_lua [[
-      vim.o.guifont="Font,Escape\\,comma, Ignore space after comma"
-      local outfile = vim.fn.tempname() .. '.html'
-      local html = require('tohtml').tohtml(0,{title="title"})
-      vim.fn.writefile(html, outfile)
-      vim.cmd.split(outfile)
-    ]]
-  else
-    exec_lua [[
-      local outfile = vim.fn.tempname() .. '.html'
-      local html = require('tohtml').tohtml(0,{title="title",font={ "dumyfont","anotherfont" }})
-      vim.fn.writefile(html, outfile)
-      vim.cmd.split(outfile)
-    ]]
-  end
+  local tmpfile = t.tmpname()
+
+  exec_lua(
+    [[
+    local guifont, outfile = ...
+    local html = (guifont
+      and require('tohtml').tohtml(0,{title="title"})
+      or require('tohtml').tohtml(0,{title="title",font={ "dumyfont","anotherfont" }}))
+    vim.fn.writefile(html, outfile)
+    vim.cmd.split(outfile)
+  ]],
+    guifont,
+    tmpfile
+  )
+
   local out_file = api.nvim_buf_get_name(api.nvim_get_current_buf())
   eq({
     '<!DOCTYPE html>',
@@ -167,9 +166,7 @@ local function test_generates_html(guifont)
     '<title>title</title>',
     ('<meta name="colorscheme" content="%s"></meta>'):format(api.nvim_get_var('colors_name')),
     '<style>',
-    ('* {font-family: %s,monospace}'):format(
-      guifont and '"Font","Escape,comma","Ignore space after comma"' or '"dumyfont","anotherfont"'
-    ),
+    ('* {font-family: %s,monospace}'):format(expect_font),
     ('body {background-color: %s; color: %s}'):format(bg, fg),
     '</style>',
     '</head>',
@@ -193,15 +190,16 @@ describe(':TOhtml', function()
     exec('colorscheme default')
   end)
 
-  it('generates html', function()
-    test_generates_html(false)
+  it('generates html with given font', function()
+    test_generates_html(false, '"dumyfont","anotherfont"')
   end)
 
   it("generates html, respects 'guifont'", function()
-    test_generates_html(true)
+    exec_lua [[vim.o.guifont='Font,Escape\\,comma, Ignore space after comma']]
+    test_generates_html(true, '"Font","Escape,comma","Ignore space after comma"')
   end)
 
-  it('expected internal html generated from range', function()
+  it('generates html from range', function()
     insert([[
     line1
     line2
@@ -239,7 +237,7 @@ describe(':TOhtml', function()
     }, fn.readfile(out_file))
   end)
 
-  it('highlight attributes generated', function()
+  it('generates highlight attributes', function()
     --Make sure to uncomment the attribute in `html_syntax_match()`
     exec('hi LINE guisp=#00ff00 gui=' .. table.concat({
       'bold',
-- 
cgit 


From e5c174421df3872df0dd3a676609d1e74dfef6a9 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Sun, 11 Aug 2024 09:27:48 +0100
Subject: test: support upvalues in exec_lua

---
 test/functional/plugin/tohtml_spec.lua | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

(limited to 'test/functional/plugin/tohtml_spec.lua')

diff --git a/test/functional/plugin/tohtml_spec.lua b/test/functional/plugin/tohtml_spec.lua
index 98a422935c..1d05f4d6b4 100644
--- a/test/functional/plugin/tohtml_spec.lua
+++ b/test/functional/plugin/tohtml_spec.lua
@@ -210,9 +210,7 @@ describe(':TOhtml', function()
     exec('set termguicolors')
     local bg = fn.synIDattr(fn.hlID('Normal'), 'bg#', 'gui')
     local fg = fn.synIDattr(fn.hlID('Normal'), 'fg#', 'gui')
-    exec_lua [[
-    local html = vim.cmd'2,2TOhtml'
-    ]]
+    n.command('2,2TOhtml')
     local out_file = api.nvim_buf_get_name(api.nvim_get_current_buf())
     eq({
       '<!DOCTYPE html>',
@@ -408,12 +406,12 @@ describe(':TOhtml', function()
     local function run()
       local buf = api.nvim_get_current_buf()
       run_tohtml_and_assert(screen, function()
-        exec_lua [[
-        local outfile = vim.fn.tempname() .. '.html'
-        local html = require('tohtml').tohtml(0,{number_lines=true})
-        vim.fn.writefile(html, outfile)
-        vim.cmd.split(outfile)
-        ]]
+        exec_lua(function()
+          local outfile = vim.fn.tempname() .. '.html'
+          local html = require('tohtml').tohtml(0, { number_lines = true })
+          vim.fn.writefile(html, outfile)
+          vim.cmd.split(outfile)
+        end)
       end)
       api.nvim_set_current_buf(buf)
     end
-- 
cgit