Merge pull request #28 from GoldenKoopa/master

feat: apply token replacement to all headers

Author: attilarepka

lua/header/core.lua

@@ -43,6 +43,13 @@ function M.add_headers(header)
 
     -- prepare headers (inline version)
     local function prepare(cb)
+        if header.config.author_from_git then
+            local gitname = vim.fn.systemlist("git config user.name")
+            if vim.v.shell_error == 0 and #gitname > 0 then
+                header.config.author = gitname[1]
+            end
+        end
+
         if header.config.license_from_file then
             local files = license.scan_license_files()
             if #files == 0 then
@@ -65,12 +72,6 @@ function M.add_headers(header)
 
         local file = vim.fn.expand("%:t")
         local created = os.date(header.config.date_created_fmt, vim.fn.getftime(vim.fn.expand("%")))
-        if header.config.author_from_git then
-            local gitname = vim.fn.systemlist("git config user.name")
-            if vim.v.shell_error == 0 and #gitname > 0 then
-                header.config.author = gitname[1]
-            end
-        end
 
         local hdrs = {}
         if header.config.file_name then
@@ -105,8 +106,14 @@ function M.add_headers(header)
         if not hdrs then
             return
         end
+
+        local new_hrds = {}
+        for i, line in ipairs(hdrs) do
+            new_hrds[i] = util.replace_all_tokens(line, header)
+        end
+
         remove_old_headers(comments_table)
-        local commented = comments.comment_headers(hdrs, comments_table, header.config.use_block_header)
+        local commented = comments.comment_headers(new_hrds, comments_table, header.config.use_block_header)
         vim.api.nvim_buf_set_lines(0, 0, 0, false, commented)
     end)
 end
@@ -119,9 +126,7 @@ function M.add_license_header(header, opts)
     end
 
     local license_text = require("header.licenses." .. string.lower(opts))
-    license_text = util.replace_token(license_text, "project", header.config.project)
-    license_text = util.replace_token(license_text, "organization", header.config.author)
-    license_text = util.replace_token(license_text, "year", os.date("%Y"))
+    license_text = util.replace_all_tokens(license_text, header)
 
     local license_table = util.string_to_table(license_text)
     local comments_table = comments_fn()

lua/header/util.lua

@@ -1,6 +1,6 @@
 local M = {}
 
-function M.replace_token(str, token, value)
+local function replace_token(str, token, value)
     local pattern = "{{%s*" .. token .. "%s*}}"
     return string.gsub(str, pattern, value or "")
 end
@@ -13,6 +13,13 @@ function M.string_to_table(str)
     return lines
 end
 
+function M.replace_all_tokens(license_text, header)
+    license_text = replace_token(license_text, "project", header.config.project)
+    license_text = replace_token(license_text, "organization", header.config.author)
+    license_text = replace_token(license_text, "year", os.date("%Y"))
+    return license_text
+end
+
 function M.escape_special_characters(pattern)
     if not pattern then
         return ""