Merge branch 'rolling'

lua/lvim/config/settings.lua

@@ -26,7 +26,7 @@ M.load_default_options = function()
     splitright = true, -- force all vertical splits to go to the right of current window
     swapfile = false, -- creates a swapfile
     termguicolors = true, -- set term gui colors (most terminals support this)
-    timeoutlen = 100, -- time to wait for a mapped sequence to complete (in milliseconds)
+    timeoutlen = 250, -- time to wait for a mapped sequence to complete (in milliseconds)
     title = true, -- set the title of window to the value of the titlestring
     -- opt.titlestring = "%<%F%=%l/%L - nvim" -- what the title of the window will be set to
     undodir = join_paths(get_cache_dir(), "undo"), -- set an undo directory

lua/lvim/core/telescope.lua

@@ -4,7 +4,7 @@ function M.config()
   -- Define this minimal config so that it's available if telescope is not yet available.
 
   lvim.builtin.telescope = {
-    ---@usage disable telescope completely [not recommeded]
+    ---@usage disable telescope completely [not recommended]
     active = true,
     on_config_done = nil,
   }

lua/lvim/core/which-key.lua

@@ -2,7 +2,7 @@ local M = {}
 
 M.config = function()
   lvim.builtin.which_key = {
-    ---@usage disable which-key completely [not recommeded]
+    ---@usage disable which-key completely [not recommended]
     active = true,
     on_config_done = nil,
     setup = {

lua/lvim/interface/text.lua

@@ -56,7 +56,7 @@ end
 --- Pretty format tables
 -- @param entries The table to format
 -- @param col_count The number of column to span the table on
--- @param col_sep The separator between each colummn, default: " "
+-- @param col_sep The separator between each column, default: " "
 function M.format_table(entries, col_count, col_sep)
   col_sep = col_sep or " "
 

lua/lvim/keymappings.lua

@@ -135,7 +135,7 @@ function M.clear(keymaps)
   for mode, mappings in pairs(keymaps) do
     local translated_mode = mode_adapters[mode] or mode
     for key, _ in pairs(mappings) do
-      -- some plugins may override default bindings that the user hasn't manually overriden
+      -- some plugins may override default bindings that the user hasn't manually overridden
       if default[mode][key] ~= nil or (default[translated_mode] ~= nil and default[translated_mode][key] ~= nil) then
         pcall(vim.api.nvim_del_keymap, translated_mode, key)
       end

lua/lvim/lsp/config.lua

@@ -34,7 +34,7 @@ return {
   document_highlight = true,
   code_lens_refresh = true,
   float = {
-    focusable = false,
+    focusable = true,
     style = "minimal",
     border = "rounded",
   },

lua/lvim/plugins.lua

@@ -1,39 +1,39 @@
 local commit = {
-  bufferline = "305d4fd693b6ebcb9ac95cf16c0693ce64960162",
+  bufferline = "e97a404bd7449ecebab243c796c1016c98397fc0",
   cmp_buffer = "f83773e2f433a923997c5faad7ea689ec24d1785",
   cmp_luasnip = "d6f837f4e8fe48eeae288e638691b91b97d1737f",
   cmp_nvim_lsp = "ebdfc204afb87f15ce3d3d3f5df0b8181443b5ba",
   cmp_path = "466b6b8270f7ba89abd59f402c73f63c7331ff6e",
-  comment = "84648f1d2d1c69b693437c9b0b12e84f526c3671",
+  comment = "18a8dc0bbdfc089d5f5a850e4640d8e75381c598",
   dapinstall = "24923c3819a450a772bb8f675926d530e829665f",
   dashboard_nvim = "d82ddae95fd4dc4c3b7bbe87f09b1840fbf20ecb",
-  fixcursorhold = "0e4e22d21975da60b0fd2d302285b3b603f9f71e",
+  fixcursorhold = "1bfb32e7ba1344925ad815cb0d7f901dbc0ff7c1",
   friendly_snippets = "2e575549910571ff5abb6b02178c69ad760a4e00",
-  gitsigns = "e2b2730254df7648c79794555978f10fceb4b163",
+  gitsigns = "1d1f043acf025f919b8dd12bb672569109c7f099",
   lua_dev = "a0ee77789d9948adce64d98700cc90cecaef88d5",
-  lualine = "6a3d367449fac10ed9d9ee356e8f02ba1ca941f6",
-  luasnip = "eb84bb89933141fa0cd0683cb960fef975106dfd",
-  nlsp_settings = "c5e55a6820d2b463c8301b05485d6fd2eaf0add3",
-  null_ls = "6859f58fba281d30750dfad681369a932d231c30",
-  nvim_autopairs = "150eac2b6d079597ef8b93ebe5989a2d84de9051",
-  nvim_cmp = "26a9184c888d6c6a5d9782f5b15e02ddd3e8a663",
-  nvim_dap = "331b26961e40fca7e09db5e80eb7b4d658a4e49e",
-  nvim_lsp_installer = "cd9a9b0e4df6e011045c8470eebea0994173578b",
-  nvim_lspconfig = "dca9cfcda9c95a3820b6443084a203bba260197a",
-  nvim_notify = "27f3176b950dc803b61c29bd007e140c232544e5",
-  nvim_tree = "0f7da146bff79032df44b423e52ea17b05d35026",
-  nvim_treesitter = "6e293230071cbdc8bb13931f8fc4739dc389fec2",
+  lualine = "40849728b6c9b3389c7b54739f426f9899b53778",
+  luasnip = "c1d07078dce0c9631e89a299e4b4a93334650a7b",
+  nlsp_settings = "80cb4d3051366afb019ddabe619b6eb967c82f63",
+  null_ls = "3059dc761b27c4c836f88879c460cd7a989caa47",
+  nvim_autopairs = "784398a8f184431fd4329f20b0e4f52e87707bbd",
+  nvim_cmp = "13d64460cba64950aff41e230cc801225bd9a3e2",
+  nvim_dap = "9fcff6e02e1a549d47a2c559a4b833798537c0bc",
+  nvim_lsp_installer = "c95ffd31428da0abaffa2459c0231fa9971fcbaa",
+  nvim_lspconfig = "19a21d5a8681f721c584125a920d4cbeda1c80cc",
+  nvim_notify = "8038d04d5371e49cf15728ae98cc6bff655b923b",
+  nvim_tree = "2e1f82d8c0c57cbc2bfdc041a3aff26947559a1e",
+  nvim_treesitter = "2298a7584414af40a6a09cbe72a81175382992c7",
   nvim_ts_context_commentstring = "097df33c9ef5bbd3828105e4bee99965b758dc3f",
   nvim_web_devicons = "e3294f687626b40754bb40ac2d636d166098b2fb",
-  packer = "c5e98e3ca84843dbae47cd8f3a76bc38c6404241",
+  packer = "963cb58c3dd15699c801baf3e64393c6795b62e9",
   plenary = "66472128c3191b786966798fc956a689705ab1be",
   popup = "b7404d35d5d3548a82149238289fa71f7f6de4ac",
   project = "cef52b8da07648b750d7f1e8fb93f12cb9482988",
-  schemastore = "002444f8c9c69eaf1f755ef1bd91c0860ec56cb9",
+  schemastore = "c0c11c832fa812174cd196c723b97c493f528b5c",
   structlog = "6f1403a192791ff1fa7ac845a73de9e860f781f1",
-  telescope = "f262e7d56d37625613c5de0df5a933cccacf13c5",
+  telescope = "df0b35c8bc0944164828ccba8ea17941423c6725",
   telescope_fzf_native = "b8662b076175e75e6497c59f3e2799b879d7b954",
-  toggleterm = "d2ceb2ca3268d09db3033b133c0ee4642e07f059",
+  toggleterm = "f9845199f1d647890ca47f6185f7ac935991b442",
   which_key = "28d2bd129575b5e9ebddd88506601290bb2bb221",
 }
 

lua/lvim/utils.lua

@@ -58,7 +58,7 @@ function M.generate_settings()
 end
 
 --- Returns a table with the default values that are missing.
---- either paramter can be empty.
+--- either parameter can be empty.
 --@param config (table) table containing entries that take priority over defaults
 --@param default_config (table) table contatining default values if found
 function M.apply_defaults(config, default_config)

tests/specs/bootstrap_spec.lua

@@ -6,12 +6,12 @@ a.describe("initial start", function()
   local lvim_config_path = get_config_dir() or home_dir .. "/.config/lvim"
   local lvim_runtime_path = get_runtime_dir() or home_dir .. "/.local/share/lunarvim"
 
-  a.it("shoud be able to detect test environment", function()
+  a.it("should be able to detect test environment", function()
     assert.truthy(os.getenv "LVIM_TEST_ENV")
     assert.falsy(package.loaded["lvim.impatient"])
   end)
 
-  a.it("should not be reading default neovim directories in the home directoies", function()
+  a.it("should not be reading default neovim directories in the home directories", function()
     local rtp_list = vim.opt.rtp:get()
     assert.falsy(vim.tbl_contains(rtp_list, vim.fn.stdpath "config"))
   end)

tests/specs/lsp_spec.lua

@@ -8,14 +8,14 @@ a.describe("lsp workflow", function()
   local Log = require "lvim.core.log"
   local logfile = Log:get_path()
 
-  a.it("shoud be able to delete ftplugin templates", function()
+  a.it("should be able to delete ftplugin templates", function()
     if utils.is_directory(lvim.lsp.templates_dir) then
       assert.equal(vim.fn.delete(lvim.lsp.templates_dir, "rf"), 0)
     end
     assert.False(utils.is_directory(lvim.lsp.templates_dir))
   end)
 
-  a.it("shoud be able to generate ftplugin templates", function()
+  a.it("should be able to generate ftplugin templates", function()
     if utils.is_directory(lvim.lsp.templates_dir) then
       assert.equal(vim.fn.delete(lvim.lsp.templates_dir, "rf"), 0)
     end
@@ -27,7 +27,7 @@ a.describe("lsp workflow", function()
     end)
   end)
 
-  a.it("shoud not attempt to re-generate ftplugin templates", function()
+  a.it("should not attempt to re-generate ftplugin templates", function()
     lvim.log.level = "debug"
 
     local plugins = require "lvim.plugins"
@@ -46,7 +46,7 @@ a.describe("lsp workflow", function()
     end)
   end)
 
-  a.it("shoud not include blacklisted servers in the generated templates", function()
+  a.it("should not include blacklisted servers in the generated templates", function()
     assert.True(utils.is_directory(lvim.lsp.templates_dir))
     require("lvim.lsp").setup()
 
@@ -57,7 +57,7 @@ a.describe("lsp workflow", function()
     end
   end)
 
-  a.it("shoud only include one server per generated template", function()
+  a.it("should only include one server per generated template", function()
     assert.True(utils.is_directory(lvim.lsp.templates_dir))
     require("lvim.lsp").setup()
 

utils/docker/Dockerfile.local

@@ -20,7 +20,7 @@ RUN apt update && \
   /LunarVim/utils/installer/install-neovim-from-release && \
   /LunarVim/utils/installer/install.sh --local --no-install-dependencies
 
-# Setup LVIM to run on starup
+# Setup LVIM to run on startup
 ENTRYPOINT ["/bin/bash"]
 CMD ["lvim"]
 

utils/docker/Dockerfile.remote

@@ -20,7 +20,7 @@ RUN apt update && \
   curl -LSs https://raw.githubusercontent.com/lunarvim/lunarvim/${LV_BRANCH}/utils/installer/install-neovim-from-release | bash && \
   LV_BRANCH=${LV_BRANCH} curl -LSs https://raw.githubusercontent.com/lunarvim/lunarvim/${LV_BRANCH}/utils/installer/install.sh | bash -s -- --no-install-dependencies
 
-# Setup LVIM to run on starup
+# Setup LVIM to run on startup
 ENTRYPOINT ["/bin/bash"]
 CMD ["lvim"]
 

utils/installer/install-neovim-from-release

@@ -55,7 +55,7 @@ function verify_neovim() {
   DOWNLOADED_SHA="$(openssl dgst -sha256 "$DOWNLOAD_DIR/$ARCHIVE_NAME.tar.gz" | awk '{print $2}')"
 
   if [ "$RELEASE_SHA" != "$DOWNLOADED_SHA" ]; then
-    echo "Error! checksum mis-match."
+    echo "Error! checksum mismatch."
     echo "Expected: $RELEASE_SHA but got: $DOWNLOADED_SHA"
     exit 1
   fi

utils/installer/install.sh

@@ -201,6 +201,12 @@ function check_system_deps() {
   check_neovim_min_version
 }
 
+function __install_nodejs_deps_pnpm() {
+  echo "Installing node modules with pnpm.."
+  pnpm install -g "${__npm_deps[@]}"
+  echo "All NodeJS dependencies are successfully installed"
+}
+
 function __install_nodejs_deps_npm() {
   echo "Installing node modules with npm.."
   for dep in "${__npm_deps[@]}"; do
@@ -229,6 +235,8 @@ function __validate_node_installation() {
 
   if [ "$pkg_manager" == "npm" ]; then
     manager_home="$(npm config get prefix 2>/dev/null)"
+  elif [ "$pkg_manager" == "pnpm" ]; then
+    manager_home="$(pnpm config get prefix 2>/dev/null)"
   else
     manager_home="$(yarn global bin 2>/dev/null)"
   fi
@@ -242,7 +250,7 @@ function __validate_node_installation() {
 }
 
 function install_nodejs_deps() {
-  local -a pkg_managers=("yarn" "npm")
+  local -a pkg_managers=("pnpm" "yarn" "npm")
   for pkg_manager in "${pkg_managers[@]}"; do
     if __validate_node_installation "$pkg_manager"; then
       eval "__install_nodejs_deps_$pkg_manager"