Dev

init.vim

@@ -214,3 +214,8 @@ func AppendSome()
    " return cmd
 endfunc
 
+" Highlight only leading whitespace characters.
+highlight WhiteSpaceLeading guifg=#918278
+highlight WhiteSpace guifg=#efe0b9
+match WhiteSpace / /
+2match WhiteSpaceLeading /^ \+/

lua/config/Editing/undo.lua

@@ -0,0 +1,27 @@
+local undo_actions = require("telescope-undo.actions")
+
+return {
+  -- use_custom_command = { 'cmd.exe', '/c', [[echo $DIFF | delta]]}, -- setting this implies `use_delta = false`. Accepted format is: { "bash", "-c", "echo '$DIFF' | delta" }
+  use_custom_command = { 'pwsh.exe', '-NoProfile', '-Command', 'echo "$DIFF" | delta'}, -- setting this implies `use_delta = false`. Accepted format is: { "bash", "-c", "echo '$DIFF' | delta" }
+  side_by_side = true, -- Available only with delta.
+  layout_strategy = 'vertical',
+  layout_config = {
+    preview_height = 0.8,
+  },
+
+  diff_context_lines = vim.o.scrolloff,
+  entry_format = 'state #$ID, $STAT, $TIME',
+
+  mappings = {
+    i = {
+      -- IMPORTANT: Note that telescope-undo must be available when telescope is configured if
+      -- you want to replicate these defaults and use the following actions. This means
+      -- installing as a dependency of telescope in it's `requirements` and loading this
+      -- extension from there instead of having the separate plugin definition as outlined
+      -- above.
+      ["<C-y>"] = undo_actions.yank_additions,
+      -- ["<C-y>"] = undo_actions.yank_deletions,
+      ["<Cr>"] = undo_actions.restore,
+    },
+  },
+}

lua/config/Lsp/completion/init.lua

@@ -7,7 +7,7 @@ local window_visuals = require('config.lsp.completion.window_visuals')
 local formatting = require('config.lsp.completion.formatting')
 local keymappings = require('config.lsp.completion.keymappings')
 
-local MIN_KEYWORD_LENGTH = 4
+local MIN_KEYWORD_LENGTH = 2
 
 cmp.setup({
   window = window_visuals,

lua/config/Lsp/lspsaga.lua

@@ -1,5 +1,5 @@
 -- change the lsp symbol kind
-local lspkind = require('lspsaga.lspkind')
+-- local lspkind = require('lspsaga.lspkind')
 
 return {
   -- ???
@@ -87,4 +87,23 @@ return {
   -- the related filetypes into this table
   -- like server_filetype_map = { metals = { "sbt", "scala" } }
   server_filetype_map = {},
+
+  ui = {
+     -- Currently, only the round theme exists
+    theme = "round",
+    -- This option only works in Neovim 0.9
+    title = true,
+    -- Border type can be single, double, rounded, solid, shadow.
+    border = "solid",
+    winblend = 0,
+    expand = "⮚ ",
+    collapse = "⮛ ",
+    preview = "👁 ", -- Eye: U+1F441.
+    code_action = "💡",
+    diagnostic = "🐞 ",
+    incoming = "📨 ", -- Incoming envelope: U+1F4E8.
+    outgoing = "✉  ", -- Envelope: ^Vu2709.
+    hover = '🔍 ', -- Left-Pointing Magnifying Glass: U+1F50D.
+    kind = {},
+  }
 }

lua/config/Lsp/null_ls.lua

@@ -19,7 +19,7 @@ return {
   formatting.stylua,
 
   -- General
-  ---@see [misspell](https://github.com/client9/misspell).
+  -- see [misspell](https://github.com/client9/misspell).
   -- diagnostics.misspell,
 
   -- Typescript

lua/config/Navigation/flit.lua

@@ -0,0 +1,9 @@
+local leap_settings = require('config.Navigation.leap.settings')
+
+return {
+  labeled_modes = 'vo',
+  multiline = false,
+  opts = {
+    safe_labels = leap_settings.safe_labels,
+  }
+}

lua/config/Navigation/leap/init.lua

@@ -0,0 +1,8 @@
+return {
+  settings = require('config.Navigation.leap.settings'),
+  keymappings = require('config.Navigation.leap.keymappings'),
+
+  commands = {
+    multi_normal = require('config.Navigation.leap.multi_normal'),
+  }
+}

lua/config/Navigation/leap/keymappings.lua

@@ -0,0 +1,17 @@
+-- See [second proposal](https://github.com/ggandor/leap.nvim/discussions/41):
+-- abcd|                    |bcde
+-- ████e  ←  Zab    zde  →  █████    (this might also be the desired behavior for Visual `s` - see below)
+-- ab██e  ←  Xab    xde  →  ███de
+local keymappings = {
+  z = { '<Plug>(leap-forward-to)', 'Leap forward to' },
+  Z = { '<Plug>(leap-backward-to)', 'Leap backward to' },
+
+  -- 'x' for exclusive.
+  x = { '<Plug>(leap-forward-till)', 'Leap forward till' },
+  X = { '<Plug>(leap-backward-till)', 'Leap backward till' },
+}
+
+return {
+  o = keymappings,
+  x = keymappings,
+}

lua/config/Navigation/leap/multi_normal.lua

@@ -0,0 +1,56 @@
+local prequire = require('utils').prequire
+
+local leap_is_available, leap = prequire('leap')
+
+if not leap_is_available then
+  return 
+end
+
+--   see [multi-cursor ':normal'](https://github.com/ggandor/leap.nvim#calling-leap-with-custom-arguments)
+--   The following example showcases a custom action, using `multiselect`. We're
+-- executing a `normal!` command at each selected position (this could be even
+-- more useful if we'd pass in custom targets too).
+function multi_normal(targets)
+  -- Get the :normal sequence to be executed.
+  local input = vim.fn.input("normal! ")
+  if #input < 1 then return end
+
+  local ns = vim.api.nvim_create_namespace("")
+
+  --   Set an extmark as an anchor for each target, so that we can also execute
+  -- commands that modify the positions of other targets (insert/change/delete).
+  for _, target in ipairs(targets) do
+    local line, col = unpack(target.pos)
+    id = vim.api.nvim_buf_set_extmark(0, ns, line - 1, col - 1, {})
+    target.extmark_id = id
+  end
+
+  --   Jump to each extmark (anchored to the "moving" targets), and execute the
+  -- command sequence.
+  for _, target in ipairs(targets) do
+    local id = target.extmark_id
+    local pos = vim.api.nvim_buf_get_extmark_by_id(0, ns, id, {})
+    vim.fn.cursor(pos[1] + 1, pos[2] + 1)
+    vim.cmd("normal! " .. input)
+  end
+
+  -- Clean up the extmarks.
+  vim.api.nvim_buf_clear_namespace(0, ns, 0, -1)
+end
+
+-- Usage:
+local create_user_command = require('config.commands.utils').create_user_command
+
+create_user_command(
+  'MultiNormal',
+  function()
+    leap.leap({
+      target_windows = { vim.fn.win_getid() },
+      action = multi_normal,
+      multiselect = true,
+    })
+  end,
+  { nargs = 0 }
+)
+
+return multi_normal

lua/config/Navigation/leap/settings.lua

@@ -0,0 +1,30 @@
+return {
+  max_phase_one_targets = nil,
+  highlight_unlabeled_phase_one_targets = true,
+  max_highlighted_traversal_targets = 10,
+  case_sensitive = true,
+  equivalence_classes = { ' \t\r\n' },
+  substitute_chars = { ['\r'] = '¬' },
+  safe_labels = {
+    's', 'f', 'n', 'u', 't', '/',
+    'S', 'F', 'N', 'L', 'H', 'M', 'U', 'G', 'T', '?', 'Z',
+  },
+  labels = {
+    's', 'f',
+    'j', 'k', 'l', 'h', 'o', 'd', 'w', 'e', 'm',
+    'v', 'r', 'c', 'x', '/', 'z',
+    'S', 'F',
+    'J', 'K', 'L', 'H', 'O', 'D', 'W', 'E', 'M',
+    'V', 'R', 'C', 'X', '?', 'Z',
+  },
+  special_keys = {
+    repeat_search = '<enter>',
+    next_phase_one_target = '<enter>',
+    next_target = {'<enter>', ';'},
+    prev_target = {'<tab>', ','},
+    next_group = '<space>',
+    prev_group = '<tab>',
+    multi_accept = '<enter>',
+    multi_revert = '<backspace>',
+  },
+}

lua/config/Navigation/sj/init.lua

@@ -0,0 +1,4 @@
+return {
+  settings = require('config.Navigation.sj.settings'),
+  keymappings = require('config.Navigation.sj.keymappings'),
+}

lua/config/Navigation/sj/keymappings.lua

@@ -0,0 +1,24 @@
+local prequire = require('utils').prequire
+
+local sj_is_available, sj = prequire('sj')
+
+if not sj_is_available then
+  return 
+end
+
+-- Keymappings used during the search are in settings.
+return {
+  n = {
+    ['/'] = { sj.run, 'Search and jump' },
+    ['?'] = { function() sj.run({ forward_search = false }) end, 'Search and jump backwards' },
+    ['<Leader>'] = {
+      -- Default bindings that we have overriden in case you just want to iterate over search results.
+      ['/'] = { '/', 'Search' },
+      ['?'] = { '?', 'Search backwards' },
+
+      -- Like a leap but a little bit different.
+      s = { function() sj.run({ search_scope = 'visible_lines' }) end, 'Search and jump across visible lines' },
+      S = { function() sj.run({ search_scope = 'visible_lines', forward_search = false }) end, 'Search and jump across visible lines backwards' },
+    },
+  },
+}

lua/config/Navigation/sj/settings.lua

@@ -0,0 +1,19 @@
+local leap_settings = require('config.Navigation.leap.settings')
+
+return {
+  auto_jump = false,
+  separator = ';', -- Character used to split the user input in <pattern> and <label> (can be empty).
+  use_overlay = false, -- If true, apply an overlay to better identify labels and matches.
+  labels = leap_settings.labels,
+  relative_labels = true, -- if true, labels are ordered from the cursor position, 
+  update_search_register = true, -- If true, update the search register with the last used pattern.
+  -- Can be: current_line, visible_lines_above, visible_lines_below, visible_lines, buffer.
+  search_scope = 'buffer', -- To align more with default / and ?
+
+  keymaps = {
+    prev_pattern = "<C-k>", -- Select the previous pattern while searching.
+    next_pattern = "<C-j>", -- Select the next pattern while searching.
+
+    send_to_qflist = "<C-q>", --- Send the search results to the quickfix list.
+  }
+}

lua/config/Navigation/syntax_tree_surfer/init.lua

@@ -0,0 +1,4 @@
+return {
+  settings = require('config.Navigation.syntax_tree_surfer.settings'),
+  keymappings = require('config.Navigation.syntax_tree_surfer.keymappings'),
+}

lua/config/Navigation/syntax_tree_surfer/keymappings.lua

@@ -0,0 +1,58 @@
+return {
+  n = {
+    v = {
+      -- Normal Mode Swapping.
+      U = {
+        function()
+          vim.opt.opfunc = 'v:lua.STSSwapUpNormal_Dot'
+          return 'g@l'
+        end,
+        'Swap up the master node relative to the cursor with its siblings',
+        expr = true,
+      },
+      D = {
+        function()
+          vim.opt.opfunc = 'v:lua.STSSwapDownNormal_Dot'
+          return 'g@l'
+        end,
+        'Swap down the master node relative to the cursor with its siblings',
+        expr = true,
+      },
+
+      -- Swap Current Node at the Cursor with it's siblings, Dot Repeatable
+      d = {
+        function()
+          vim.opt.opfunc = 'v:lua.STSSwapCurrentNodeNextNormal_Dot'
+          return 'g@l'
+        end,
+        'Swap current node with next',
+        expr = true,
+      },
+      u = {
+        function()
+          vim.opt.opfunc = 'v:lua.STSSwapCurrentNodePrevNormal_Dot'
+          return 'g@l'
+        end,
+        'Swap current node with previous',
+        expr = true,
+      },
+
+
+      -- Visual Selection from Normal Mode.
+      x = { '<Cmd>STSSelectMasterNode<Cr>', 'Select master node' },
+      n = { '<Cmd>STSSelectCurrentNode<Cr>', 'Select current node' },
+    },
+  },
+
+  x = {
+    -- Select Nodes in Visual Mode
+    J = { '<Cmd>STSSelectNextSiblingNode<Cr>', 'Select next sibling node' },
+    K = { '<Cmd>STSSelectPrevSiblingNode<Cr>', 'Select previous sibling node' },
+    H = { '<Cmd>STSSelectParentNode<Cr>', 'Select parent node' },
+    L = { '<Cmd>STSSelectChildNode<Cr>', 'select child node' },
+
+    -- Swapping Nodes in Visual Mode
+    ['<A-j>'] = { '<Cmd>STSSwapNextVisual<Cr>', 'Swap with next node' },
+    ['<A-k>'] = { '<Cmd>STSSwapPrevVisual<Cr>', 'Swap with previous node' },
+  }
+}

lua/config/Navigation/syntax_tree_surfer/settings.lua

@@ -0,0 +1 @@
+return {}

lua/config/Navigation/telescope.lua

@@ -27,6 +27,7 @@ return {
   },
 
   extensions = {
-    file_browser = require('config.Navigation.telescope_file_browser')
+    file_browser = require('config.Navigation.telescope_file_browser'),
+    undo = require('config.Editing.undo'),
   }
 }

lua/config/commands/init.lua

@@ -1,7 +1,7 @@
 local choose_and_edit_target = require('config.commands.choose_and_edit_target')
 local create_user_command = require('config.commands.utils').create_user_command
 
----@see `:h user-commands` and `:h nvim_create_user_command()`.
+-- See `:h user-commands` and `:h nvim_create_user_command()`.
 
 create_user_command(
   'ChooseAndEditConfigs',

lua/config/keymappings/buffer.lua

@@ -2,10 +2,11 @@ return {
   name = 'Buffer',
 
   -- Deletes buffer without closing vim if it was in the only window.
-  d = { ':Bdelete<cr>', 'Delete' },
+  d = { '<Cmd>Bdelete<Cr>', 'Delete' },
+  D = { '<Cmd>%bdelete|edit#<Cr>', 'Delete all buffer except for current one' },
 
-  ---@see{the lua api at @link{https://github.com/akinsho/bufferline.nvim/blob/main/lua/bufferline.lua}}
+  --see the [lua api](https://github.com/akinsho/bufferline.nvim/blob/main/lua/bufferline.lua)
   --p = { function() bufferline.pick_buffer() end, 'Pick' },
-  p = { '<cmd>BufferLinePick<cr>', 'Pick' },
-  n = { 'bn', 'Next' },
+  p = { '<Cmd>BufferLinePick<Cr>', 'Pick' },
+  n = { '<Cmd>bnext<Cr>', 'Next' },
 }

lua/config/treesitter/init.lua

@@ -20,6 +20,8 @@ local incremental_selection = require_treesitter_configuration(
 )
 local rainbow = require_treesitter_configuration('rainbow')
 
+local textobjects = require_treesitter_configuration('textobjects')
+
 -- List of language that will be disabled
 local DISABLED_HIGHLIGHT_FILETYPES = {
   'css',
@@ -54,6 +56,8 @@ tree_sitter.setup({
   -- Brackets.
   rainbow = rainbow,
 
+  textobjects = textobjects,
+
   context_commentstring = {
     enable = true,
     -- Disable the CursorHold autocommand of this plugin to work with