kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-19 18:55:14 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge 551cb8712f into 7121983c45

Browse Source
This commit is contained in:
dundargoc 2024-12-18 14:40:43 +00:00 committed by GitHub
commit 0b7f87a2a9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
12 changed files with 29 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
BUILD.md
View File

@ -131,7 +131,8 @@ https://github.com/cascent/neovim-cygwin was built on Cygwin 2.9.0. Newer `libuv
1. From the MSYS2 shell, install these packages: 1. From the MSYS2 shell, install these packages:
``` ```
pacman -S \ pacman -S \
mingw-w64-ucrt-x86_64-{gcc,cmake,make,ninja,diffutils} mingw-w64-ucrt-x86_64-gcc \
mingw-w64-x86_64-{cmake,make,ninja,diffutils}
``` ```
2. From the Windows Command Prompt (`cmd.exe`), set up the `PATH` and build. 2. From the Windows Command Prompt (`cmd.exe`), set up the `PATH` and build.
@ -292,13 +293,13 @@ Platform-specific requirements are listed below.
### Ubuntu / Debian ### Ubuntu / Debian
```sh ```sh
sudo apt-get install ninja-build gettext cmake unzip curl build-essential sudo apt-get install ninja-build gettext cmake curl build-essential
``` ```
### RHEL / Fedora ### RHEL / Fedora
``` ```
sudo dnf -y install ninja-build cmake gcc make unzip gettext curl glibc-gconv-extra sudo dnf -y install ninja-build cmake gcc make gettext curl glibc-gconv-extra
``` ```
### openSUSE ### openSUSE
@ -310,13 +311,13 @@ sudo zypper install ninja cmake gcc-c++ gettext-tools curl
### Arch Linux ### Arch Linux
``` ```
sudo pacman -S base-devel cmake unzip ninja curl sudo pacman -S base-devel cmake ninja curl
``` ```
### Alpine Linux ### Alpine Linux
``` ```
apk add build-base cmake coreutils curl unzip gettext-tiny-dev apk add build-base cmake coreutils curl gettext-tiny-dev
``` ```
### Void Linux ### Void Linux
@ -380,7 +381,7 @@ or a specific SHA1 like `--override-input neovim-src github:neovim/neovim/89dc8f
### FreeBSD ### FreeBSD
``` ```
sudo pkg install cmake gmake sha unzip wget gettext curl sudo pkg install cmake gmake sha wget gettext curl
``` ```
If you get an error regarding a `sha256sum` mismatch, where the actual SHA-256 hash is `e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855`, then this is your issue (that's the `sha256sum` of an empty file). If you get an error regarding a `sha256sum` mismatch, where the actual SHA-256 hash is `e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855`, then this is your issue (that's the `sha256sum` of an empty file).
@ -388,7 +389,7 @@ If you get an error regarding a `sha256sum` mismatch, where the actual SHA-256 h
### OpenBSD ### OpenBSD
```sh ```sh
doas pkg_add gmake cmake unzip curl gettext-tools doas pkg_add gmake cmake curl gettext-tools
``` ```
Build can sometimes fail when using the top level `Makefile`, apparently due to some third-party component (see [#2445-comment](https://github.com/neovim/neovim/issues/2445#issuecomment-108124236)). The following instructions use CMake: Build can sometimes fail when using the top level `Makefile`, apparently due to some third-party component (see [#2445-comment](https://github.com/neovim/neovim/issues/2445#issuecomment-108124236)). The following instructions use CMake:

3
Makefile
View File

@ -133,6 +133,9 @@ generated-sources benchmark $(FORMAT) $(LINT) $(TEST) doc: | build/.ran-cmake
test: $(TEST) test: $(TEST)
# iwyu-fix-includes can be downloaded from
# https://github.com/include-what-you-use/include-what-you-use/blob/master/fix_includes.py.
# Create a iwyu-fix-includes shell script in your $PATH that invokes the python script.
iwyu: build/.ran-cmake iwyu: build/.ran-cmake
$(CMAKE) --preset iwyu $(CMAKE) --preset iwyu
$(CMAKE) --build build > build/iwyu.log $(CMAKE) --build build > build/iwyu.log

6
runtime/doc/lsp.txt
View File

@ -32,7 +32,7 @@ Follow these steps to get LSP features:
Example: >lua Example: >lua
vim.lsp.config['luals'] = { vim.lsp.config['luals'] = {
-- Command and arguments to start the server. -- Command and arguments to start the server.
cmd = { 'lua-language-server' } cmd = { 'lua-language-server' },
-- Filetypes to automatically attach to. -- Filetypes to automatically attach to.
filetypes = { 'lua' }, filetypes = { 'lua' },
@ -97,7 +97,7 @@ Given: >lua
multilineTokenSupport = true, multilineTokenSupport = true,
} }
} }
} },
root_markers = { '.git' }, root_markers = { '.git' },
}) })
@ -885,7 +885,7 @@ foldexpr({lnum}) *vim.lsp.foldexpr()*
To use, check for the "textDocument/foldingRange" capability in an To use, check for the "textDocument/foldingRange" capability in an
|LspAttach| autocommand. Example: >lua |LspAttach| autocommand. Example: >lua
vim.api.nvim_create_autocommand('LspAttach', { vim.api.nvim_create_autocmd('LspAttach', {
callback = function(args) callback = function(args)
local client = vim.lsp.get_client_by_id(args.data.client_id) local client = vim.lsp.get_client_by_id(args.data.client_id)
if client:supports_method('textDocument/foldingRange') then if client:supports_method('textDocument/foldingRange') then

4
runtime/doc/options.txt
View File

@ -1560,8 +1560,8 @@ A jump table for the options with a short description can be found at |Q_op|.
"menu" or "menuone". No effect if "longest" is present. "menu" or "menuone". No effect if "longest" is present.
noselect Same as "noinsert", except that no menu item is noselect Same as "noinsert", except that no menu item is
pre-selected. If both "noinsert" and "noselect" are present, pre-selected. If both "noinsert" and "noselect" are
"noselect" has precedence. present, "noselect" has precedence.
fuzzy Enable |fuzzy-matching| for completion candidates. This fuzzy Enable |fuzzy-matching| for completion candidates. This
allows for more flexible and intuitive matching, where allows for more flexible and intuitive matching, where

2
runtime/doc/treesitter.txt
View File

@ -70,7 +70,7 @@ adds arbitrary metadata and conditional data to a match.
Queries are written in a lisp-like language documented in Queries are written in a lisp-like language documented in
https://tree-sitter.github.io/tree-sitter/using-parsers#query-syntax https://tree-sitter.github.io/tree-sitter/using-parsers#query-syntax
Note: The predicates listed there page differ from those Nvim supports. See Note: The predicates listed there differ from those Nvim supports. See
|treesitter-predicates| for a complete list of predicates supported by Nvim. |treesitter-predicates| for a complete list of predicates supported by Nvim.
Nvim looks for queries as `*.scm` files in a `queries` directory under Nvim looks for queries as `*.scm` files in a `queries` directory under

4
runtime/lua/vim/_meta/options.lua generated
View File

@ -1087,8 +1087,8 @@ vim.go.cia = vim.go.completeitemalign
--- "menu" or "menuone". No effect if "longest" is present. --- "menu" or "menuone". No effect if "longest" is present.
--- ---
--- noselect Same as "noinsert", except that no menu item is --- noselect Same as "noinsert", except that no menu item is
--- pre-selected. If both "noinsert" and "noselect" are present, --- pre-selected. If both "noinsert" and "noselect" are
--- "noselect" has precedence. --- present, "noselect" has precedence.
--- ---
--- fuzzy Enable `fuzzy-matching` for completion candidates. This --- fuzzy Enable `fuzzy-matching` for completion candidates. This
--- allows for more flexible and intuitive matching, where --- allows for more flexible and intuitive matching, where

2
runtime/lua/vim/lsp.lua
View File

@ -1379,7 +1379,7 @@ end
--- |LspAttach| autocommand. Example: --- |LspAttach| autocommand. Example:
--- ---
--- ```lua --- ```lua
--- vim.api.nvim_create_autocommand('LspAttach', { --- vim.api.nvim_create_autocmd('LspAttach', {
--- callback = function(args) --- callback = function(args)
--- local client = vim.lsp.get_client_by_id(args.data.client_id) --- local client = vim.lsp.get_client_by_id(args.data.client_id)
--- if client:supports_method('textDocument/foldingRange') then --- if client:supports_method('textDocument/foldingRange') then

2
runtime/lua/vim/lsp/diagnostic.lua
View File

@ -208,7 +208,7 @@ end
--- @param uri string --- @param uri string
--- @param client_id? integer --- @param client_id? integer
--- @param diagnostics vim.Diagnostic[] --- @param diagnostics lsp.Diagnostic[]
--- @param is_pull boolean --- @param is_pull boolean
local function handle_diagnostics(uri, client_id, diagnostics, is_pull) local function handle_diagnostics(uri, client_id, diagnostics, is_pull)
local fname = vim.uri_to_fname(uri) local fname = vim.uri_to_fname(uri)

4
src/nvim/options.lua
View File

@ -1531,8 +1531,8 @@ return {
"menu" or "menuone". No effect if "longest" is present. "menu" or "menuone". No effect if "longest" is present.
noselect Same as "noinsert", except that no menu item is noselect Same as "noinsert", except that no menu item is
pre-selected. If both "noinsert" and "noselect" are present, pre-selected. If both "noinsert" and "noselect" are
"noselect" has precedence. present, "noselect" has precedence.
fuzzy Enable |fuzzy-matching| for completion candidates. This fuzzy Enable |fuzzy-matching| for completion candidates. This
allows for more flexible and intuitive matching, where allows for more flexible and intuitive matching, where

2
src/nvim/window.c
View File

@ -6378,7 +6378,7 @@ void win_drag_vsep_line(win_T *dragwin, int offset)
fr = curfr; // put fr at window that grows fr = curfr; // put fr at window that grows
} }
// If not enough room thn move as far as we can // If not enough room then move as far as we can
offset = MIN(offset, room); offset = MIN(offset, room);
// No room at all, quit. // No room at all, quit.

6
test/unit/mbyte_spec.lua
View File

@ -58,11 +58,11 @@ describe('mbyte', function()
lib.schar_get(buf, lib.utfc_ptr2schar(to_string(seq), firstc)) lib.schar_get(buf, lib.utfc_ptr2schar(to_string(seq), firstc))
local str = ffi.string(buf) local str = ffi.string(buf)
if 1 > 2 then -- for debugging if 1 > 2 then -- for debugging
local tabel = {} local tbl = {}
for i = 1, #str do for i = 1, #str do
table.insert(tabel, string.format('0x%02x', string.byte(str, i))) table.insert(tbl, string.format('0x%02x', string.byte(str, i)))
end end
print('{ ' .. table.concat(tabel, ', ') .. ' }') print('{ ' .. table.concat(tbl, ', ') .. ' }')
io.stdout:flush() io.stdout:flush()
end end
return { str, firstc[0] } return { str, firstc[0] }

4
test/unit/vterm_spec.lua
View File

@ -1094,7 +1094,7 @@ describe('vterm', function()
push('\x1b[0F', vt) push('\x1b[0F', vt)
cursor(0, 0, state) cursor(0, 0, state)
-- Cursor Horizonal Absolute -- Cursor Horizontal Absolute
push('\n', vt) push('\n', vt)
cursor(1, 0, state) cursor(1, 0, state)
push('\x1b[20G', vt) push('\x1b[20G', vt)
@ -3067,7 +3067,7 @@ describe('vterm', function()
screen screen
) )
-- Outputing CJK doublewidth in 80th column should wraparound to next line and not crash" -- Outputting CJK doublewidth in 80th column should wraparound to next line and not crash"
reset(nil, screen) reset(nil, screen)
push('\x1b[80G\xEF\xBC\x90', vt) push('\x1b[80G\xEF\xBC\x90', vt)
screen_cell(0, 79, '{} width=1 attrs={} fg=rgb(240,240,240) bg=rgb(0,0,0)', screen) screen_cell(0, 79, '{} width=1 attrs={} fg=rgb(240,240,240) bg=rgb(0,0,0)', screen)