From 48d1c38fa88dbfbaa35e81560cf0fa7d8793b195 Mon Sep 17 00:00:00 2001 From: kylo252 <59826753+kylo252@users.noreply.github.com> Date: Sat, 15 Oct 2022 18:32:11 +0200 Subject: [PATCH] chore(plugins): bump version (#3248) * ci: update workflows * chore(plugins): bump version * chore: update depdecated settings for comment.nvim * chore(lsp): update skiplist * fixup!: take 2 for comment.nvim --- .github/workflows/commitlint.yml | 4 +-- .github/workflows/format.yaml | 4 +-- .github/workflows/install.yaml | 6 ++-- .github/workflows/lint.yaml | 4 +-- .github/workflows/plugins.yml | 6 ++-- lua/lvim/core/comment.lua | 44 +++++++++++++--------------- lua/lvim/lsp/config.lua | 6 ++-- snapshots/default.json | 50 ++++++++++++++++---------------- 8 files changed, 60 insertions(+), 64 deletions(-) diff --git a/.github/workflows/commitlint.yml b/.github/workflows/commitlint.yml index 93c776e3..de6be24f 100644 --- a/.github/workflows/commitlint.yml +++ b/.github/workflows/commitlint.yml @@ -6,10 +6,10 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} steps: - - uses: actions/checkout@v2.3.1 + - uses: actions/checkout@v3 with: fetch-depth: 0 - - uses: wagoid/commitlint-github-action@v4 + - uses: wagoid/commitlint-github-action@v5 with: configFile: .github/workflows/commitlint.config.js helpURL: https://github.com/LunarVim/LunarVim/blob/rolling/CONTRIBUTING.md#commit-messages diff --git a/.github/workflows/format.yaml b/.github/workflows/format.yaml index 27b061ef..64da97e6 100644 --- a/.github/workflows/format.yaml +++ b/.github/workflows/format.yaml @@ -15,7 +15,7 @@ jobs: name: "Formatting check with Stylua" runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Lint with stylua uses: JohnnyMorganz/stylua-action@v1 @@ -29,7 +29,7 @@ jobs: name: "Formatting check with shfmt" runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Setup Go uses: actions/setup-go@v2 diff --git a/.github/workflows/install.yaml b/.github/workflows/install.yaml index 8ab27e88..5f72bcac 100644 --- a/.github/workflows/install.yaml +++ b/.github/workflows/install.yaml @@ -33,13 +33,13 @@ jobs: neovim: nightly runs-on: ${{ matrix.runner }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Install neovim binary from release env: RELEASE_VER: ${{ matrix.neovim }} run: | - echo "$HOME/.local/bin" >> $GITHUB_PATH + echo "$HOME/.local/bin" >> "$GITHUB_PATH" bash ./utils/installer/install-neovim-from-release - name: Install LunarVim @@ -72,7 +72,7 @@ jobs: shell: pwsh steps: # it's not currently possbile to run tests on windows, see nvim-lua/plenary.nvim#255 - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Install neovim binary uses: rhysd/action-setup-vim@v1 diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index c238a5d1..f136d442 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -15,7 +15,7 @@ jobs: name: "Linting with luacheck" runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: leafo/gh-actions-lua@v8 - uses: leafo/gh-actions-luarocks@v4 @@ -30,7 +30,7 @@ jobs: name: Shellcheck runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Run ShellCheck uses: ludeeus/action-shellcheck@master with: diff --git a/.github/workflows/plugins.yml b/.github/workflows/plugins.yml index d5c6310f..46c88c81 100644 --- a/.github/workflows/plugins.yml +++ b/.github/workflows/plugins.yml @@ -25,15 +25,13 @@ jobs: contents: write pull-requests: write steps: - - uses: actions/checkout@v2 - with: - ref: ${{ github.head_ref }} + - uses: actions/checkout@v3 - name: Install neovim binary uses: rhysd/action-setup-vim@v1 with: neovim: true - version: v0.8.0 + version: nightly - name: Install LunarVim timeout-minutes: 4 diff --git a/lua/lvim/core/comment.lua b/lua/lvim/core/comment.lua index d07739c6..501d01b6 100644 --- a/lua/lvim/core/comment.lua +++ b/lua/lvim/core/comment.lua @@ -1,27 +1,10 @@ local M = {} function M.config() - local pre_hook = nil - if lvim.builtin.treesitter.context_commentstring.enable then - pre_hook = function(ctx) - local U = require "Comment.utils" - - -- Determine whether to use linewise or blockwise commentstring - local type = ctx.ctype == U.ctype.linewise and "__default" or "__multiline" - - -- Determine the location where to calculate commentstring from - local location = nil - if ctx.ctype == U.ctype.blockwise then - location = require("ts_context_commentstring.utils").get_cursor_location() - elseif ctx.cmotion == U.cmotion.v or ctx.cmotion == U.cmotion.V then - location = require("ts_context_commentstring.utils").get_visual_start_location() - end - - return require("ts_context_commentstring.internal").calculate_commentstring { - key = type, - location = location, - } - end + local pre_hook + local loaded, ts_comment = pcall(require, "ts_context_commentstring.integrations.comment_nvim") + if loaded and ts_comment then + pre_hook = ts_comment.create_pre_hook() end lvim.builtin.comment = { active = true, @@ -30,6 +13,11 @@ function M.config() ---@type boolean padding = true, + ---Whether cursor should stay at the + ---same position. Only works in NORMAL + ---mode mappings + sticky = true, + ---Lines to be ignored while comment/uncomment. ---Could be a regex string or a function that returns a regex string. ---Example: Use '^$' to ignore empty lines @@ -45,9 +33,6 @@ function M.config() ---Extra mapping ---Includes `gco`, `gcO`, `gcA` extra = true, - ---Extended mapping - ---Includes `g>`, `g<`, `g>[count]{motion}` and `g<[count]{motion}` - extended = false, }, ---LHS of line and block comment toggle mapping in NORMAL/VISUAL mode @@ -68,6 +53,17 @@ function M.config() block = "gb", }, + ---LHS of extra mappings + ---@type table + extra = { + ---Add comment on the line above + above = "gcO", + ---Add comment on the line below + below = "gco", + ---Add comment at the end of line + eol = "gcA", + }, + ---Pre-hook, called before commenting the line ---@type function|nil pre_hook = pre_hook, diff --git a/lua/lvim/lsp/config.lua b/lua/lvim/lsp/config.lua index b1a45d5e..358e83f8 100644 --- a/lua/lvim/lsp/config.lua +++ b/lua/lvim/lsp/config.lua @@ -10,6 +10,7 @@ local skipped_servers = { "eslint", "eslintls", "golangci_lint_ls", + "gradle_ls", "graphql", "jedi_language_server", "ltex", @@ -18,8 +19,9 @@ local skipped_servers = { "psalm", "pylsp", "quick_lint_js", - "rome", "reason_ls", + "rome", + "ruby_ls", "scry", "solang", "solc", @@ -31,8 +33,8 @@ local skipped_servers = { "sqlls", "sqls", "stylelint_lsp", - "tflint", "svlangserver", + "tflint", "verible", "vuels", } diff --git a/snapshots/default.json b/snapshots/default.json index cd2d16c9..f0a6d293 100644 --- a/snapshots/default.json +++ b/snapshots/default.json @@ -1,33 +1,33 @@ { "Comment.nvim": { - "commit": "97a188a" + "commit": "ad7ffa8" }, "LuaSnip": { - "commit": "8f8d493" + "commit": "663d544" }, "alpha-nvim": { "commit": "0bb6fc0" }, "bufferline.nvim": { - "commit": "83bf4dc" + "commit": "0606cee" }, "cmp-buffer": { "commit": "3022dbc" }, "cmp-nvim-lsp": { - "commit": "389f06d" + "commit": "2a84710" }, "cmp-path": { - "commit": "447c87c" + "commit": "91ff86c" }, "cmp_luasnip": { "commit": "a9de941" }, "friendly-snippets": { - "commit": "2be79d8" + "commit": "fd16b4d" }, "gitsigns.nvim": { - "commit": "f98c85e" + "commit": "2c6f96d" }, "indent-blankline.nvim": { "commit": "db7cbcb" @@ -35,35 +35,35 @@ "lir.nvim": { "commit": "7d8c6c4" }, - "neodev.nvim": { - "commit": "d785dc8" - }, "lualine.nvim": { - "commit": "a52f078" + "commit": "edca2b0" }, "mason-lspconfig.nvim": { - "commit": "0051870" + "commit": "bf8ac12" }, "mason.nvim": { - "commit": "59e6fee" + "commit": "45b9a4d" + }, + "neodev.nvim": { + "commit": "08d8455" }, "nlsp-settings.nvim": { - "commit": "019ea0b" + "commit": "8500c4e" }, "null-ls.nvim": { - "commit": "c0c19f3" + "commit": "643c67a" }, "nvim-autopairs": { "commit": "4fc96c8" }, "nvim-cmp": { - "commit": "b0dff0e" + "commit": "3347dd3" }, "nvim-dap": { - "commit": "0b320f5" + "commit": "e71da68" }, "nvim-dap-ui": { - "commit": "c8ce83a" + "commit": "1cd4764" }, "nvim-lspconfig": { "commit": "35a731b" @@ -75,16 +75,16 @@ "commit": "af935fd" }, "nvim-tree.lua": { - "commit": "b01e7be" + "commit": "c446527" }, "nvim-treesitter": { - "commit": "8e76333" + "commit": "1da61c9" }, "nvim-ts-context-commentstring": { - "commit": "4d3a68c" + "commit": "2941f00" }, "nvim-web-devicons": { - "commit": "563f363" + "commit": "a8cf88c" }, "onedarker.nvim": { "commit": "b00dd21" @@ -102,7 +102,7 @@ "commit": "628de7e" }, "schemastore.nvim": { - "commit": "33873c7" + "commit": "03f4f94" }, "structlog.nvim": { "commit": "232a8e2" @@ -117,10 +117,10 @@ "commit": "2a787c4" }, "tokyonight.nvim": { - "commit": "4092905" + "commit": "e6307e1" }, "vim-illuminate": { - "commit": "a2e8476" + "commit": "0603e75" }, "which-key.nvim": { "commit": "6885b66"