diff --git a/.github/workflows/install.yaml b/.github/workflows/install.yaml index 60c8890a..dc8be0b0 100644 --- a/.github/workflows/install.yaml +++ b/.github/workflows/install.yaml @@ -21,10 +21,10 @@ jobs: include: - runner: ubuntu-latest os: linux - neovim: v0.9.1 + neovim: v0.9.5 - runner: macos-latest os: osx - neovim: v0.9.1 + neovim: v0.9.5 - runner: ubuntu-22.04 os: linux neovim: nightly diff --git a/lua/lvim/lsp/config.lua b/lua/lvim/lsp/config.lua index 87b996cb..7313f1f2 100644 --- a/lua/lvim/lsp/config.lua +++ b/lua/lvim/lsp/config.lua @@ -4,26 +4,35 @@ local skipped_servers = { "antlersls", "ast_grep", "azure_pipelines_ls", + "basedpyright", "biome", "ccls", "cssmodules_ls", "custom_elements_ls", "denols", "docker_compose_language_service", + "dprint", "elp", "ember", "emmet_language_server", "emmet_ls", "eslint", "eslintls", + "fennel_language_server", + "gitlab_ci_ls", "glint", + "glslls", "golangci_lint_ls", "gradle_ls", "graphql", + "hdl_checker", + "hydra_lsp", "htmx", "java_language_server", "jedi_language_server", + "lexical", "ltex", + "lwc_ls", "mdx_analyzer", "neocmake", "nim_langserver", @@ -40,14 +49,17 @@ local skipped_servers = { "rome", "rubocop", "ruby_ls", + "ruby_lsp", "ruff_lsp", "scry", + "snyk_ls", "solang", "solc", "solidity_ls", "solidity_ls_nomicfoundation", "sorbet", "sourcekit", + "somesass_ls", "sourcery", "spectral", "sqlls", @@ -56,8 +68,11 @@ local skipped_servers = { "stimulus_ls", "stylelint_lsp", "svlangserver", + "swift_mesonls", + "templ", "tflint", "unocss", + "vacuum", "verible", "v_analyzer", "vtsls", diff --git a/lua/lvim/lsp/templates.lua b/lua/lvim/lsp/templates.lua index 681e48e0..4a65facb 100644 --- a/lua/lvim/lsp/templates.lua +++ b/lua/lvim/lsp/templates.lua @@ -12,6 +12,7 @@ function M.remove_template_files() -- remove any outdated files for _, file in ipairs(vim.fn.glob(ftplugin_dir .. "/*.lua", 1, 1)) do vim.fn.delete(file) + vim.wait(10) end end diff --git a/snapshots/default.json b/snapshots/default.json index 595933de..998e722b 100644 --- a/snapshots/default.json +++ b/snapshots/default.json @@ -39,7 +39,7 @@ "commit": "9637670" }, "lazy.nvim": { - "commit": "9658486" + "commit": "bef521a" }, "lir.nvim": { "commit": "969e95b" @@ -51,16 +51,16 @@ "commit": "08bbc93" }, "mason-lspconfig.nvim": { - "commit": "41674c9" + "commit": "273fdde" }, "mason.nvim": { - "commit": "41e75af" + "commit": "751b1fc" }, "neodev.nvim": { - "commit": "1676d2c" + "commit": "ce9a2e8" }, "nlsp-settings.nvim": { - "commit": "2a52e79" + "commit": "707b431" }, "none-ls.nvim": { "commit": "3a48266" @@ -78,7 +78,7 @@ "commit": "34160a7" }, "nvim-lspconfig": { - "commit": "fcf153f" + "commit": "aa5f4f4" }, "nvim-navic": { "commit": "8649f69" @@ -105,7 +105,7 @@ "commit": "8c6bad7" }, "schemastore.nvim": { - "commit": "5bfeb36" + "commit": "2ef728f" }, "structlog.nvim": { "commit": "45b26a2" diff --git a/tests/specs/lsp_spec.lua b/tests/specs/lsp_spec.lua index fd45b232..3f814058 100644 --- a/tests/specs/lsp_spec.lua +++ b/tests/specs/lsp_spec.lua @@ -29,14 +29,16 @@ describe("lsp workflow", function() 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) + vim.fn.delete(lvim.lsp.templates_dir, "rf") + vim.wait(100) end assert.False(utils.is_directory(lvim.lsp.templates_dir)) end) 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) + vim.fn.delete(lvim.lsp.templates_dir, "rf") + vim.wait(100) end require("lvim.lsp").setup() @@ -60,7 +62,7 @@ describe("lsp workflow", function() require("lvim.lsp").setup() vim.wait(500) - local allowed_dupes = { "tailwindcss" } + local allowed_dupes = { "tailwindcss", "ruff" } local template_files = vim.fn.glob(lvim.lsp.templates_dir .. "/*.lua", 1, 1) for _, file in ipairs(template_files) do local content = {} diff --git a/utils/installer/install-neovim-from-release b/utils/installer/install-neovim-from-release index 076ac46d..955f0285 100755 --- a/utils/installer/install-neovim-from-release +++ b/utils/installer/install-neovim-from-release @@ -15,9 +15,14 @@ if [ "$OS" == "Linux" ]; then ARCHIVE_NAME="nvim-linux64" RELEASE_NAME="nvim-linux64" elif [ "$OS" == "Darwin" ]; then - ARCHIVE_NAME="nvim-macos" - # for some reason the archive has a different name - RELEASE_NAME="nvim-osx64" + if [ "$RELEASE_VER" == "nightly" ]; then + ARCHIVE_NAME="nvim-macos-x86_64" + RELEASE_NAME="nvim-macos-x86_64" + else + ARCHIVE_NAME="nvim-macos" + # for some reason the archive has a different name + RELEASE_NAME="nvim-osx64" + fi else echo "$OS platform is not supported currently" exit 1 diff --git a/utils/installer/uninstall.sh b/utils/installer/uninstall.sh index 5a7e6897..9b262631 100755 --- a/utils/installer/uninstall.sh +++ b/utils/installer/uninstall.sh @@ -51,7 +51,7 @@ function parse_arguments() { function remove_lvim_dirs() { if [ "$ARGS_REMOVE_CONFIG" -eq 1 ]; then - __lvim_dirs+=($__lvim_config_dir) + __lvim_dirs+=("$__lvim_config_dir") fi for dir in "${__lvim_dirs[@]}"; do rm -rf "$dir"