feat: add support for Lisp nil <==> t

Signed-off-by: Guennadi Maximov C <g.maxc.fox@protonmail.com>

Author: DrKJeff16

lua/boolean-toggle.lua

@@ -1,21 +1,23 @@
 local Util = require('boolean-toggle.util')
 local Config = require('boolean-toggle.config')
 
-local valid_chars = Util.dedup(vim.split('aeflrstuAEFLRSTU', '', { trimempty = false }))
+local valid_chars = Util.dedup(vim.split('aeflnrstuAEFLRSTU', '', { trimempty = false }))
 local delim = vim.split([[.,'"()[]{}$#?!:;%%^%*+=\\|/<>~` ]], '', { trimempty = false })
 
 ---@enum BooleanToggle.ConvertToFalse
 local convert_to_false = {
   ['true'] = 'false',
   True = 'False',
   TRUE = 'FALSE',
+  t = 'nil',
 }
 
 ---@enum BooleanToggle.ConvertToTrue
 local convert_to_true = {
   ['false'] = 'true',
   False = 'True',
   FALSE = 'TRUE',
+  ['nil'] = 't',
 }
 
 ---@enum BooleanToggle.Convert
@@ -26,6 +28,8 @@ local convert = {
   False = 'True',
   TRUE = 'FALSE',
   FALSE = 'TRUE',
+  t = 'nil',
+  ['nil'] = 't',
 }
 
 ---@param line string
@@ -122,6 +126,10 @@ function M.boolean_under_cursor()
     col = col + 1
   end
 
+  local bufnr = vim.api.nvim_get_current_buf()
+  if vim.list_contains({ 't', 'nil' }, word) and Util.optget('filetype', 'buf', bufnr) == 'lisp' then
+    return true, start_col, col
+  end
   if vim.list_contains({ 'false', 'true', 'False', 'True', 'FALSE', 'TRUE' }, word) then
     return true, start_col, col
   end
@@ -155,7 +163,7 @@ function M.cursor_toggle_boolean()
   local win = vim.api.nvim_get_current_win()
   local pos = vim.api.nvim_win_get_cursor(win)
   local before, after = get_boolean_surround(line, start_col, end_col)
-  if not vim.list_contains({ 'f', 'F', 't', 'T' }, line:sub(pos[2] + 1, pos[2] + 1)) then
+  if not vim.list_contains({ 'f', 'F', 't', 'T', 'n' }, line:sub(pos[2] + 1, pos[2] + 1)) then
     pos[2] = pos[2] + (line:len() > (before .. convert[current_bool] .. after):len() and -1 or 1)
   end
 

lua/boolean-toggle/util.lua

@@ -5,9 +5,83 @@
 ---@field [3]? boolean
 ---@field [4]? string
 
+local ERROR = vim.log.levels.ERROR
+
 ---@class BooleanToggle.Util
 local M = {}
 
+---@overload fun(option: string|vim.wo|vim.bo): value: any
+---@overload fun(option: string|vim.wo|vim.bo, param: 'scope', param_value: 'local'|'global'): value: any
+---@overload fun(option: string|vim.wo|vim.bo, param: 'ft', param_value: string): value: any
+---@overload fun(option: string|vim.wo|vim.bo, param: 'buf'|'win', param_value: integer): value: any
+---@nodiscard
+function M.optget(option, param, param_value)
+  M.validate({
+    option = { option, { 'string' } },
+    param = { param, { 'string', 'nil' }, true },
+    param_value = { param_value, { 'string', 'number', 'nil' }, true },
+  })
+  param = param or 'buf'
+  if not vim.list_contains({ 'scope', 'ft', 'buf', 'win' }, param) then
+    error(('Bad parameter: `%s`\nCan only accept `scope`, `ft`, `buf` or `win`!'):format(vim.inspect(param)), ERROR)
+  end
+  if param == 'scope' then
+    param_value = param_value or 'local'
+    if not vim.list_contains({ 'global', 'local' }, param_value) then
+      error(('Bad param value `%s`\nCan only accept `global` or `local`!'):format(vim.inspect(param_value)), ERROR)
+    end
+  end
+  if param == 'ft' and (not param_value or type(param_value) ~= 'string') then
+    error('Missing/bad value for `ft` parameter!', ERROR)
+  end
+  if
+    vim.list_contains({ 'win', 'buf' }, param)
+    and not (param_value and type(param_value) == 'number' and M.is_int(param_value, param_value >= 0))
+  then
+    error('Missing/bad value for `win`/`buf` parameter!', ERROR)
+  end
+
+  return vim.api.nvim_get_option_value(option, { [param] = param_value })
+end
+
+---@overload fun(option: string|vim.wo|vim.bo, value: any)
+---@overload fun(option: string|vim.wo|vim.bo, value: any, param: 'scope', param_value: 'local'|'global')
+---@overload fun(option: string|vim.wo|vim.bo, value: any, param: 'ft', param_value: string)
+---@overload fun(option: string|vim.wo|vim.bo, value: any, param: 'buf'|'win', param_value: integer)
+function M.optset(option, value, param, param_value)
+  M.validate({
+    option = { option, { 'string' } },
+    param = { param, { 'string', 'nil' }, true },
+    param_value = { param_value, { 'string', 'number', 'nil' }, true },
+  })
+  if value == nil then
+    error('Empty option value is unacceptable!', ERROR)
+  end
+  param = param or 'buf'
+
+  if not vim.list_contains({ 'scope', 'ft', 'buf', 'win' }, param) then
+    error(('Bad parameter: `%s`\nCan only accept `scope`, `ft`, `buf` or `win`!'):format(vim.inspect(param)), ERROR)
+  end
+
+  if param == 'scope' then
+    param_value = param_value or 'local'
+    if not vim.list_contains({ 'global', 'local' }, param_value) then
+      error(('Bad param value `%s`\nCan only accept `global` or `local`!'):format(vim.inspect(param_value)), ERROR)
+    end
+  end
+  if param == 'ft' and (not param_value or type(param_value) ~= 'string') then
+    error('Missing/bad value for `ft` parameter!', ERROR)
+  end
+  if
+    vim.list_contains({ 'win', 'buf' }, param)
+    and not (param_value and type(param_value) == 'number' and M.is_int(param_value, param_value >= 0))
+  then
+    error('Missing/bad value for `win`/`buf` parameter!', ERROR)
+  end
+
+  vim.api.nvim_set_option_value(option, value, { [param] = param_value })
+end
+
 ---Checks whether nvim is running on Windows.
 --- ---
 ---@return boolean win32