Fix non-ascii chars alignment in agenda view and fix setting tags on headlines with non ascii chars

Author: kristijanhusak

lua/orgmode/agenda/views/agenda.lua

@@ -186,7 +186,7 @@ function AgendaView:build()
     table.insert(content, { line_content = self:_format_day(day) })
 
     local longest_items = utils.reduce(agenda_items, function(acc, agenda_item)
-      acc.category = math.max(acc.category, agenda_item.headline:get_category():len())
+      acc.category = math.max(acc.category, vim.api.nvim_strwidth(agenda_item.headline:get_category()))
       acc.label = math.max(acc.label, vim.api.nvim_strwidth(agenda_item.label))
       return acc
     end, {
@@ -264,10 +264,10 @@ end
 ---@return table
 function AgendaView.build_agenda_item_content(agenda_item, longest_category, longest_date, line_nr)
   local headline = agenda_item.headline
-  local category = string.format('  %-' .. longest_category .. 's', headline:get_category() .. ':')
+  local category = '  ' .. utils.pad_right(string.format('%s:', headline:get_category()), longest_category)
   local date = agenda_item.label
   if date ~= '' then
-    date = string.format(' %-' .. longest_date .. 's', agenda_item.label)
+    date = ' ' .. utils.pad_right(agenda_item.label, longest_date)
   end
   local todo_keyword = agenda_item.headline.todo_keyword.value
   local todo_padding = ''

lua/orgmode/agenda/views/todos.lua

@@ -61,7 +61,7 @@ function AgendaTodosView.generate_view(items, content, filters)
   items = sort_todos(items)
   local offset = #content
   local longest_category = utils.reduce(items, function(acc, todo)
-    return math.max(acc, todo:get_category():len())
+    return math.max(acc, vim.api.nvim_strwidth(todo:get_category()))
   end, 0)
 
   for i, headline in ipairs(items) do
@@ -74,7 +74,7 @@ function AgendaTodosView.generate_view(items, content, filters)
 end
 
 function AgendaTodosView.generate_todo_item(headline, longest_category, line_nr)
-  local category = string.format('  %-' .. (longest_category + 1) .. 's', headline:get_category() .. ':')
+  local category = '  ' .. utils.pad_right(string.format('%s:', headline:get_category()), longest_category + 1)
   local todo_keyword = headline.todo_keyword.value
   local todo_keyword_padding = todo_keyword ~= '' and ' ' or ''
   local line = string.format('  %s%s%s %s', category, todo_keyword_padding, todo_keyword, headline.title)

lua/orgmode/parser/table/cell.lua

@@ -1,3 +1,5 @@
+local utils = require('orgmode.utils')
+
 ---@class TableCell
 ---@field row TableRow
 ---@field value string
@@ -32,7 +34,7 @@ function TableCell:compile()
   if self.row.is_separator then
     val = string.format('-%s-', string.rep('-', width))
   else
-    val = string.format(' %-' .. width .. 's ', self.value)
+    val = string.format(' %s ', utils.pad_right(self.value, width))
   end
   local start_col = self.row.table.start_col + 2
   if self.col > 1 then

lua/orgmode/treesitter/headline.lua

@@ -45,21 +45,24 @@ function Headline:set_tags(tags)
     end
   end
 
+  local txt = query.get_node_text(predecessor, 0)
   local pred_end_row, pred_end_col, _ = predecessor:end_()
-  local end_col = vim.api.nvim_strwidth(vim.fn.getline(pred_end_row + 1))
+  local line = vim.fn.getline(pred_end_row + 1)
+  local stars = line:match('^%*+%s*')
+  local end_col = line:len()
 
   local text = ''
   tags = vim.trim(tags):gsub('^:', ''):gsub(':$', '')
   if tags ~= '' then
     tags = ':' .. tags .. ':'
 
     local to_col = config.org_tags_column
+    local tags_width = vim.api.nvim_strwidth(tags)
     if to_col < 0 then
-      local tags_width = vim.api.nvim_strwidth(tags)
       to_col = math.abs(to_col) - tags_width
     end
 
-    local spaces = math.max(to_col - pred_end_col, 1)
+    local spaces = math.max(to_col - (vim.api.nvim_strwidth(txt) + stars:len()) - tags_width, 1)
     text = string.rep(' ', spaces) .. tags
   end
 

lua/orgmode/utils/init.lua

@@ -578,4 +578,14 @@ function utils.open_float(name, scale)
   })
 end
 
+---@param str string
+---@param amount number
+function utils.pad_right(str, amount)
+  local spaces = math.max(0, amount - vim.api.nvim_strwidth(str))
+  if spaces == 0 then
+    return str
+  end
+  return string.format('%s%s', str, string.rep(' ', spaces))
+end
+
 return utils

tests/plenary/ui/mappings_spec.lua

@@ -284,7 +284,7 @@ describe('Mappings', function()
     vim.fn.cursor(3, 1)
     vim.cmd([[norm ,oA]])
     assert.are.same(
-      '* TODO Test orgmode                                                             :ARCHIVE:',
+      '* TODO Test orgmode                                                    :ARCHIVE:',
       vim.fn.getline(3)
     )
   end)