Merge branch 'main' into dev

Author: cjodo

.chglog/CHANGELOG.tpl.md

@@ -0,0 +1,24 @@
+{{ range .Versions }}
+<a name="{{ .Tag.Name }}"></a>
+## {{ if .Tag.Previous }}[{{ .Tag.Name }}]({{ $.Info.RepositoryURL }}/compare/{{ .Tag.Previous.Name }}...{{ .Tag.Name }}){{ else }}{{ .Tag.Name }}{{ end }}
+
+> {{ datetime "2006-01-02" .Tag.Date }}
+
+{{ range .CommitGroups -}}
+### {{ .Title }}
+
+{{ range .Commits -}}
+* {{ .Subject }}
+{{ end }}
+{{ end -}}
+
+{{- if .NoteGroups -}}
+{{ range .NoteGroups -}}
+### {{ .Title }}
+
+{{ range .Notes }}
+{{ .Body }}
+{{ end }}
+{{ end -}}
+{{ end -}}
+{{ end -}}

.chglog/config.yml

@@ -0,0 +1,27 @@
+style: github
+template: CHANGELOG.tpl.md
+info:
+  title: CHANGELOG
+  repository_url: https://github.com/cjodo/convert.nvim
+options:
+  commits:
+    # filters:
+    #   Type:
+    #     - feat
+    #     - fix
+    #     - perf
+    #     - refactor
+  commit_groups:
+    # title_maps:
+    #   feat: Features
+    #   fix: Bug Fixes
+    #   perf: Performance Improvements
+    #   refactor: Code Refactoring
+  header:
+    pattern: "^(\\w*)\\:\\s(.*)$"
+    pattern_maps:
+      - Type
+      - Subject
+  notes:
+    keywords:
+      - BREAKING CHANGE

README.md

@@ -1,54 +1,106 @@
 # convert.nvim
 
-https://github.com/user-attachments/assets/46129dd1-35b0-41ce-a1d8-ead1922d8af4
+https://github.com/user-attachments/assets/46320296-58c1-408c-9fd5-e3ee757d9288
 
 ## Dependencies
 - [nui.nvim](https://github.com/MunifTanjim/nui.nvim): UI Components
 
 ## Features
 - Convert css units with one simple command
-- track base font size on save to convert px to rems accurately (Single file support only)
+- Base font supported for accurate rem conversion
+- Convert all in a selection or entire buffer
 
 ## Installation: 
 Use your favourite plugin manager
 
 - Lazy: 
 ```lua
 return {
-  'cjodo/convert.nvim',
-  dependencies = {
-    'MunifTanjim/nui.nvim'
-  },
-  keys = {
-    { "<leader>cn", "<cmd>ConvertFindNext<CR>", desc = "Find next convertable unit" },
-    { "<leader>cc", "<cmd>ConvertFindCurrent<CR>", desc = "Find convertable unit in current line" },
-    { "<leader>ca", "<cmd>ConvertAll<CR>", desc = "Convert all of a specified unit" },
-  },
+    'cjodo/convert.nvim',
+    dependencies = {
+        'MunifTanjim/nui.nvim'
+    },
+    keys = {
+        { "<leader>cn", "<cmd>ConvertFindNext<CR>", desc = "Find next convertable unit" },
+        { "<leader>cc", "<cmd>ConvertFindCurrent<CR>", desc = "Find convertable unit in current line" },
+        -- Add "v" to enable converting a selected region
+        { "<leader>ca", "<cmd>ConvertAll<CR>", mode = {"n", "v"}, desc = "Convert all of a specified unit" },
+    },
 }
+```
+- Packer: 
+```lua
+use {
+    'cjodo/convert.nvim',
+    requires = { 'MunifTanjim/nui.nvim' },
+    config = function()
+        require('convert').setup()
+        vim.keymap.set('n', '<leader>cn', '<cmd>ConvertFindNext<CR>', { desc = 'Find next convertible unit' })
+        vim.keymap.set('n', '<leader>cc', '<cmd>ConvertFindCurrent<CR>', { desc = 'Find convertible unit in current line' })
+        vim.keymap.set({ 'n', 'v' }, '<leader>ca', '<cmd>ConvertAll<CR>', { desc = 'Convert all of a specified unit' })
+    end
+}
+
 ```
 ## Commands:
 
 | Command              | Description                                                               |
 |----------------------|---------------------------------------------------------------------------|
 | :ConvertFindNext     | Finds the next convertible unit                                           |
 | :ConvertFindCurrent  | Finds the convertible unit in the current line (starting from cursor)     |
-| :ConvertAll          | Converts all instances of a given unit to another                         |
+| :ConvertAll          | Converts all instances in a buffer or visual mode selection of one unit to another of the same type (size, color)                         |
 
 ## Usage
 You can choose you're own custom keys for the ui menu
 
 ```lua
-  config = function()
+config = function()
     local convert = require('convert')
     -- defaults
     convert.setup({
-      keymaps = {
-        focus_next = { "j", "<Down>", "<Tab>" },
-        focus_prev = { "k", "<Up>", "<S-Tab>" },
-        close = { "<Esc>", "<C-c>", 'qq' },
-        submit = { "<CR>", "<Space>" },
-      }
+        keymaps = {
+            focus_next = { "j", "<Down>", "<Tab>" },
+            focus_prev = { "k", "<Up>", "<S-Tab>" },
+            close = { "<Esc>", "<C-c>", 'qq' },
+            submit = { "<CR>", "<Space>" },
+        },
+        modes = { "color", "size", "numbers" } -- available conversion modes
     })
-  end
+end
 
 ```
+## Supported Conversions
+
+### Size Units 📏  
+
+| Unit | Description |
+|------|------------|
+| `px`  | Pixels |
+| `rem` | Relative to root element |
+| `cm`  | Centimeters |
+| `in`  | Inches |
+| `mm`  | Millimeters |
+| `pt`  | Points |
+| `pc`  | Picas |
+
+---
+
+### Color Formats 🎨  
+
+| Format | Description |
+|--------|------------|
+| `rgb`  | Red-Green-Blue |
+| `hex`  | Hexadecimal color code |
+| `hsl`  | Hue-Saturation-Lightness |
+
+---
+
+### Number Systems 🔢  (Experimental)
+- Defined with respective prefix: 0b, 0x, 0o
+
+| Format       | Description |
+|-------------|------------|
+| `bin`       | Binary |
+| `hexadecimal` | Hexadecimal |
+| `octal`     | Octal |
+

lazy.lua

@@ -3,10 +3,9 @@ local utils = require("convert.utils")
 
 local M = {}
 
-
 ---@param from string
 ---@param to string
----@param val number
+---@param val number|string
 ---@return string
 M.convert = function(from, to, val)
 	if from == to then
@@ -18,12 +17,22 @@ M.convert = function(from, to, val)
 			return tostring(val)
 		end
 
+		if (from == "bin" or "hexadecimal" or "octal") then
+			local cases = {
+				["bin"] = function () return "0b" .. val end,
+				["hexadecimal"] = function () return "0x" .. val end,
+				["octal"] = function () return "0o" .. val end,
+			}
+
+			return tostring((cases[from])())
+		end
+
 		return val .. from
 	end
 
 	local round = 0
 
-	if (to ~= 'px') then
+	if to ~= 'px' then
 		round = 2
 	end
 
@@ -37,6 +46,18 @@ M.convert = function(from, to, val)
 		return "#" .. result
 	end
 
+	if to == 'bin' then
+		return "0b".. result
+	end
+
+	if to == 'hexadecimal' then
+		return "0x".. result
+	end
+
+	if to == 'octal' then
+		return "0o".. result
+	end
+
 	return tostring(utils.round(result, round)) .. to
 end
 

lua/convert/calculator.lua

@@ -8,4 +8,6 @@ config.keymaps = {
 	submit = { "<CR>", "<Space>" },
 }
 
+config.modes = { "color", "size", "number" }
+
 return config

lua/convert/config.lua

@@ -22,9 +22,6 @@ local convert_all = function(bufnr, from, to)
 	end
 
 	local lines = vim.api.nvim_buf_get_lines(bufnr, 0, -1, false)
-	for row = 1, #lines, 1 do
-		local line = lines[row]
-
 		local all_units = utils.find_all_units_in_line(line, row)
 		if all_units ~= nil and #all_units > 0 and all_units[1].unit == from then
 			for i = #all_units, 1, -1 do

lua/convert/convert_all.lua

@@ -275,6 +275,54 @@ converters.hsl = {
 	end
 }
 
+converters.bin = {
+	hexadecimal = function(val)
+		local decimal = tonumber(val, 2)
+		if not decimal then
+			error("invalid bin string: " .. val, 1)
+		end
+
+		return string.format("%X", decimal)
+	end,
+
+	octal = function (val)
+		local decimal = tonumber(val, 2)
+		if not decimal then
+			error("invalid bin string: " .. val, 1)
+			return
+		end
+
+		local octal = ""
+		while decimal > 0 do
+			local remainder = decimal % 8
+			octal = remainder .. octal
+			decimal = math.floor(decimal / 8)
+		end
+
+		return octal == "" and "0" or octal
+	end
+}
+
+converters.hexadecimal = {
+	bin = function (val)
+		return utils.num_convert(val, 16, 2)
+	end,
+	octal = function (val)
+		return utils.num_convert(val, 16, 8)
+	end
+}
+
+converters.octal = {
+	bin = function (val)
+		return utils.num_convert(val, 8, 2)
+	end,
+	hexadecimal = function (val)
+		local decimal = tonumber(val, 8)
+		return string.format("%X", decimal)
+	end,
+}
+
+
 local function convert(from, to, val)
 	if converters[from] and converters[from][to] then
 		return converters[from][to](val)

lua/convert/converters.lua

@@ -3,13 +3,17 @@ local ui = require("convert.ui.open_popup")
 local config = require("convert.config")
 local split = require("convert.ui.open_split")
 
+local Menu = require("nui.menu")
 
 local M = {}
 
 M.setup = function(opts)
 	if opts.keymaps then
 		config.keymaps = opts.keymaps
 	end
+	if opts.modes then
+		config.modes = opts.modes
+	end
 end
 
 M.find_next = function()
@@ -51,7 +55,34 @@ M.find_current = function()
 end
 
 M.convert_all = function()
-	split.open_split(config)
+	local units_menu = {}
+	-- TODO: refactor this 
+	if utils.contains(config.modes, "color") then
+		table.insert(units_menu, Menu.separator('Colors', { char = '-', text_align = 'left' }))
+		table.insert(units_menu, Menu.item('rgb'))
+		table.insert(units_menu, Menu.item('hex'))
+		table.insert(units_menu, Menu.item('hsl'))
+	end
+
+	if utils.contains(config.modes, "size") then
+		table.insert(units_menu, Menu.separator('Size', { char = '-', text_align = 'left' }))
+		table.insert(units_menu, Menu.item('px'))
+		table.insert(units_menu, Menu.item('rem'))
+		table.insert(units_menu, Menu.item('cm'))
+		table.insert(units_menu, Menu.item('in'))
+		table.insert(units_menu, Menu.item('mm'))
+		table.insert(units_menu, Menu.item('pt'))
+		table.insert(units_menu, Menu.item('pc'))
+	end
+
+	if utils.contains(config.modes, "number") then
+		table.insert(units_menu, Menu.separator('Numbers', { char = '-', text_align = 'left' }))
+		table.insert(units_menu, Menu.item('bin'))
+		table.insert(units_menu, Menu.item('hexadecimal'))
+		table.insert(units_menu, Menu.item('octal'))
+	end
+
+	split.open_split(config, units_menu)
 end
 
 return M

lua/convert/init.lua

@@ -4,7 +4,7 @@ M.matchers = {
 	px = "(%d+%.?%d*)px",
 	rem = "(%d+%.?%d*)rem",
 	em = "(%d+%.?%d*)em",
-	['in'] = "(%d+%.?%d*)in", -- in is a reserved lua keyword
+	['in'] = "(%d+%.?%d*)in", -- "in" is a reserved lua keyword
 	ch = "(%d+%.?%d*)ch",
 	mm = "(%d+%.?%d*)mm",
 	cm = "(%d+%.?%d*)cm",
@@ -13,6 +13,9 @@ M.matchers = {
 	rgb = 'rgb%(%d+, %d+, %d+%)',
 	hex = "#(%x%x%x%x?%x?%x?%x?%x?)",
 	hsl = 'hsl%(%d+, %d+%%, %d+%%%)',
+	bin = '0b([01]+)',
+	octal = '0o([0-7]+)',
+	hexadecimal = '0x([%da-fA-F]+)',
 }
 
 M.extract = {