diff options
| -rw-r--r-- | .github/workflows/notes.md | 7 | ||||
| -rw-r--r-- | .github/workflows/release.yml | 3 | ||||
| -rw-r--r-- | runtime/lua/vim/lsp.lua | 17 |
3 files changed, 6 insertions, 21 deletions
diff --git a/.github/workflows/notes.md b/.github/workflows/notes.md index d752f10609..0f8c67da48 100644 --- a/.github/workflows/notes.md +++ b/.github/workflows/notes.md @@ -33,12 +33,6 @@ ${NVIM_VERSION} 2. Extract: `tar xzvf nvim-linux64.tar.gz` 3. Run `./nvim-linux64/bin/nvim` -#### Debian Package - -1. Download **nvim-linux64.deb** -2. Install the package using `sudo apt install ./nvim-linux64.deb` -3. Run `nvim` - #### AppImage 1. Download **nvim.appimage** 2. Run `chmod u+x nvim.appimage && ./nvim.appimage` @@ -56,7 +50,6 @@ ${NVIM_VERSION} ``` ${SHA_LINUX_64_TAR} -${SHA_LINUX_64_DEB} ${SHA_APP_IMAGE} ${SHA_APP_IMAGE_ZSYNC} ${SHA_MACOS} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b3a32600dd..17737dcb36 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -46,7 +46,6 @@ jobs: name: nvim-linux64 path: | build/nvim-linux64.tar.gz - build/nvim-linux64.deb retention-days: 1 appimage: @@ -182,8 +181,6 @@ jobs: cd ./nvim-linux64 sha256sum nvim-linux64.tar.gz > nvim-linux64.tar.gz.sha256sum echo "SHA_LINUX_64_TAR=$(cat nvim-linux64.tar.gz.sha256sum)" >> $GITHUB_ENV - sha256sum nvim-linux64.deb > nvim-linux64.deb.sha256sum - echo "SHA_LINUX_64_DEB=$(cat nvim-linux64.deb.sha256sum)" >> $GITHUB_ENV - name: Generate App Image SHA256 checksums run: | cd ./appimage diff --git a/runtime/lua/vim/lsp.lua b/runtime/lua/vim/lsp.lua index 7e8c73ddb6..2d39f2d45d 100644 --- a/runtime/lua/vim/lsp.lua +++ b/runtime/lua/vim/lsp.lua @@ -1101,21 +1101,16 @@ function lsp.start_client(config) return true end - local last_set_from = vim.fn.gettext('\n\tLast set from ') - local line = vim.fn.gettext(' line ') - local scriptname - - vim.api.nvim_buf_call(bufnr, function() - scriptname = vim.fn - .execute('verbose set ' .. option .. '?') - :match(last_set_from .. '(.*)' .. line .. '%d+') - end) + local info = vim.api.nvim_get_option_info2(option, { buf = bufnr }) + local scriptinfo = vim.tbl_filter(function(e) + return e.sid == info.last_set_sid + end, vim.fn.getscriptinfo()) - if not scriptname then + if #scriptinfo ~= 1 then return false end - return vim.startswith(vim.fn.expand(scriptname), vim.fn.expand('$VIMRUNTIME')) + return vim.startswith(scriptinfo[1].name, vim.fn.expand('$VIMRUNTIME')) end ---@private |