diff options
| -rw-r--r-- | INSTALL.md | 8 | ||||
| -rw-r--r-- | runtime/doc/api.txt | 2 | ||||
| -rw-r--r-- | runtime/doc/gui.txt | 2 | ||||
| -rw-r--r-- | runtime/doc/lsp.txt | 5 | ||||
| -rw-r--r-- | runtime/doc/starting.txt | 2 | ||||
| -rw-r--r-- | runtime/doc/treesitter.txt | 13 | ||||
| -rw-r--r-- | runtime/lua/vim/_defaults.lua | 2 | ||||
| -rw-r--r-- | runtime/lua/vim/filetype/detect.lua | 2 | ||||
| -rw-r--r-- | runtime/lua/vim/lsp.lua | 5 | ||||
| -rw-r--r-- | runtime/lua/vim/lsp/buf.lua | 2 | ||||
| -rw-r--r-- | runtime/lua/vim/treesitter/languagetree.lua | 2 | ||||
| -rw-r--r-- | src/nvim/api/ui.c | 2 | ||||
| -rw-r--r-- | src/nvim/event/socket.c | 2 | ||||
| -rw-r--r-- | src/nvim/ex_getln.c | 2 | ||||
| -rw-r--r-- | src/nvim/normal.c | 13 | ||||
| -rw-r--r-- | src/nvim/os/signal.c | 3 | ||||
| -rw-r--r-- | src/nvim/path.c | 2 |
17 files changed, 38 insertions, 31 deletions
diff --git a/INSTALL.md b/INSTALL.md index 0701bf2720..6c2ec3a273 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -108,20 +108,20 @@ For arm64: The [Releases](https://github.com/neovim/neovim/releases) page provides pre-built binaries for Linux systems. ```sh -curl -LO https://github.com/neovim/neovim/releases/latest/download/nvim-linux64.tar.gz +curl -LO https://github.com/neovim/neovim/releases/latest/download/nvim-linux-x86_64.tar.gz sudo rm -rf /opt/nvim -sudo tar -C /opt -xzf nvim-linux64.tar.gz +sudo tar -C /opt -xzf nvim-linux-x86_64.tar.gz ``` Then add this to your shell config (`~/.bashrc`, `~/.zshrc`, ...): - export PATH="$PATH:/opt/nvim-linux64/bin" + export PATH="$PATH:/opt/nvim-linux-x86_64/bin" ### AppImage ("universal" Linux package) The [Releases](https://github.com/neovim/neovim/releases) page provides an [AppImage](https://appimage.org) that runs on most Linux systems. No installation is needed, just download `nvim-linux-x86_64.appimage` and run it. (It might not work if your Linux distribution is more than 4 years old.) The following instructions assume an `x86_64` architecture; on ARM Linux replace with `arm64`. - curl -LO https://github.com/neovim/neovim/releases/latest/download/nvim-linux-86_64.appimage + curl -LO https://github.com/neovim/neovim/releases/latest/download/nvim-linux-x86_64.appimage chmod u+x nvim-linux-x86_64.appimage ./nvim-linux-x86_64.appimage diff --git a/runtime/doc/api.txt b/runtime/doc/api.txt index 07bd7dd192..92f5a261ee 100644 --- a/runtime/doc/api.txt +++ b/runtime/doc/api.txt @@ -422,7 +422,7 @@ after adding them, the returned |extmark| id can be used. >lua See also |vim.hl.range()|. ============================================================================== -Floating windows *api-floatwin* +Floating windows *api-floatwin* *floating-windows* Floating windows ("floats") are displayed on top of normal windows. This is useful to implement simple widgets, such as tooltips displayed next to the diff --git a/runtime/doc/gui.txt b/runtime/doc/gui.txt index 6fc5b27580..ecb4de09bb 100644 --- a/runtime/doc/gui.txt +++ b/runtime/doc/gui.txt @@ -22,7 +22,7 @@ Third-party GUIs *third-party-guis* *vscode* Nvim provides a builtin "terminal UI" (|TUI|), but also works with many (third-party) GUIs which may provide a fresh look or extra features on top of -Nvim. For example, "vscode-neovim" essentally allows you to use VSCode as +Nvim. For example, "vscode-neovim" essentially allows you to use VSCode as a Nvim GUI. - vscode-neovim (Nvim in VSCode!) https://github.com/vscode-neovim/vscode-neovim diff --git a/runtime/doc/lsp.txt b/runtime/doc/lsp.txt index 351f9a56ac..25ef7f24cc 100644 --- a/runtime/doc/lsp.txt +++ b/runtime/doc/lsp.txt @@ -882,8 +882,9 @@ foldexpr({lnum}) *vim.lsp.foldexpr()* callback = function(args) local client = vim.lsp.get_client_by_id(args.data.client_id) if client:supports_method('textDocument/foldingRange') then - vim.wo.foldmethod = 'expr' - vim.wo.foldexpr = 'v:lua.vim.lsp.foldexpr()' + local win = vim.api.nvim_get_current_win() + vim.wo[win][0].foldmethod = 'expr' + vim.wo[win][0].foldexpr = 'v:lua.vim.lsp.foldexpr()' end end, }) diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt index c0254c3fa1..d8d5e42397 100644 --- a/runtime/doc/starting.txt +++ b/runtime/doc/starting.txt @@ -290,7 +290,7 @@ argument. *-n* -n Disables |swap-file| by setting 'updatecount' to 0 (after executing any |vimrc|). Recovery after a crash will be - impossible. Improves peformance when working with a file on + impossible. Improves performance when working with a file on a very slow medium (usb drive, network share). Enable it again by setting 'updatecount' to some value, e.g. diff --git a/runtime/doc/treesitter.txt b/runtime/doc/treesitter.txt index df974d750c..257a6a24e7 100644 --- a/runtime/doc/treesitter.txt +++ b/runtime/doc/treesitter.txt @@ -497,7 +497,7 @@ convention, nodes to be concealed are captured as `@conceal`, but any capture can be used. For example, the following query can be used to hide code block delimiters in Markdown: >query - (fenced_code_block_delimiter @conceal (#set! conceal "")) + ((fenced_code_block_delimiter) @conceal (#set! conceal "")) < It is also possible to replace a node with a single character, which (unlike legacy syntax) can be given a custom highlight. For example, the following @@ -508,6 +508,13 @@ still highlighted the same as other operators: >query < Conceals specified in this way respect 'conceallevel'. +Note that although you can use any string for `conceal`, only the first +character will be used: >query + + ; identifiers will be concealed with 'f'. + ((identifier) @conceal (#set! conceal "foo")) +< + *treesitter-highlight-priority* Treesitter uses |nvim_buf_set_extmark()| to set highlights with a default priority of 100. This enables plugins to set a highlighting priority lower or @@ -1666,8 +1673,8 @@ LanguageTree:parse({range}, {on_parse}) *LanguageTree:parse()* Function invoked when parsing completes. When provided and `vim.g._ts_force_sync_parsing` is not set, parsing will run asynchronously. The first argument to the function is - a string respresenting the error type, in case of a - failure (currently only possible for timeouts). The second + a string representing the error type, in case of a failure + (currently only possible for timeouts). The second argument is the list of trees returned by the parse (upon success), or `nil` if the parse timed out (determined by 'redrawtime'). diff --git a/runtime/lua/vim/_defaults.lua b/runtime/lua/vim/_defaults.lua index 28f1542f64..69204e3fe6 100644 --- a/runtime/lua/vim/_defaults.lua +++ b/runtime/lua/vim/_defaults.lua @@ -652,7 +652,7 @@ do -- This autocommand updates the value of 'background' anytime we receive -- an OSC 11 response from the terminal emulator. If the user has set - -- 'background' explictly then we will delete this autocommand, + -- 'background' explicitly then we will delete this autocommand, -- effectively disabling automatic background setting. local force = false local id = vim.api.nvim_create_autocmd('TermResponse', { diff --git a/runtime/lua/vim/filetype/detect.lua b/runtime/lua/vim/filetype/detect.lua index 91c0406dc0..fc0b45ecd8 100644 --- a/runtime/lua/vim/filetype/detect.lua +++ b/runtime/lua/vim/filetype/detect.lua @@ -34,7 +34,7 @@ local matchregex = vim.filetype._matchregex -- can be detected from the first five lines of the file. --- @type vim.filetype.mapfn function M.asm(path, bufnr) - -- tiasm uses `* commment` + -- tiasm uses `* comment` local lines = table.concat(getlines(bufnr, 1, 10), '\n') if findany(lines, { '^%*', '\n%*', 'Texas Instruments Incorporated' }) then return 'tiasm' diff --git a/runtime/lua/vim/lsp.lua b/runtime/lua/vim/lsp.lua index 5226c8ae37..a45f9adeb6 100644 --- a/runtime/lua/vim/lsp.lua +++ b/runtime/lua/vim/lsp.lua @@ -1395,8 +1395,9 @@ end --- callback = function(args) --- local client = vim.lsp.get_client_by_id(args.data.client_id) --- if client:supports_method('textDocument/foldingRange') then ---- vim.wo.foldmethod = 'expr' ---- vim.wo.foldexpr = 'v:lua.vim.lsp.foldexpr()' +--- local win = vim.api.nvim_get_current_win() +--- vim.wo[win][0].foldmethod = 'expr' +--- vim.wo[win][0].foldexpr = 'v:lua.vim.lsp.foldexpr()' --- end --- end, --- }) diff --git a/runtime/lua/vim/lsp/buf.lua b/runtime/lua/vim/lsp/buf.lua index 638a0d0f3f..48aa809ebd 100644 --- a/runtime/lua/vim/lsp/buf.lua +++ b/runtime/lua/vim/lsp/buf.lua @@ -423,7 +423,7 @@ end --- ---@see vim.lsp.protocol.CompletionTriggerKind function M.completion(context) - vim.depends('vim.lsp.buf.completion', 'vim.lsp.commpletion.trigger', '0.12') + vim.depends('vim.lsp.buf.completion', 'vim.lsp.completion.trigger', '0.12') return lsp.buf_request( 0, ms.textDocument_completion, diff --git a/runtime/lua/vim/treesitter/languagetree.lua b/runtime/lua/vim/treesitter/languagetree.lua index 8ea1c44cdc..1f7872715f 100644 --- a/runtime/lua/vim/treesitter/languagetree.lua +++ b/runtime/lua/vim/treesitter/languagetree.lua @@ -523,7 +523,7 @@ end --- only the root tree without injections). --- @param on_parse fun(err?: string, trees?: table<integer, TSTree>)? Function invoked when parsing completes. --- When provided and `vim.g._ts_force_sync_parsing` is not set, parsing will run ---- asynchronously. The first argument to the function is a string respresenting the error type, +--- asynchronously. The first argument to the function is a string representing the error type, --- in case of a failure (currently only possible for timeouts). The second argument is the list --- of trees returned by the parse (upon success), or `nil` if the parse timed out (determined --- by 'redrawtime'). diff --git a/src/nvim/api/ui.c b/src/nvim/api/ui.c index db8a5d93d0..f6f32a73ed 100644 --- a/src/nvim/api/ui.c +++ b/src/nvim/api/ui.c @@ -537,7 +537,7 @@ static void prepare_call(RemoteUI *ui, const char *name) ui_alloc_buf(ui); } - // To optimize data transfer(especially for "grid_line"), we bundle adjacent + // To optimize data transfer (especially for "grid_line"), we bundle adjacent // calls to same method together, so only add a new call entry if the last // method call is different from "name" diff --git a/src/nvim/event/socket.c b/src/nvim/event/socket.c index 1214c3e336..c340ef2826 100644 --- a/src/nvim/event/socket.c +++ b/src/nvim/event/socket.c @@ -33,7 +33,7 @@ int socket_watcher_init(Loop *loop, SocketWatcher *watcher, const char *endpoint char *host_end = strrchr(addr, ':'); if (host_end && addr != host_end) { - // Split user specified address into two strings, addr(hostname) and port. + // Split user specified address into two strings, addr (hostname) and port. // The port part in watcher->addr will be updated later. *host_end = NUL; char *port = host_end + 1; diff --git a/src/nvim/ex_getln.c b/src/nvim/ex_getln.c index b5fa05e5a4..fc20748309 100644 --- a/src/nvim/ex_getln.c +++ b/src/nvim/ex_getln.c @@ -2593,7 +2593,7 @@ static bool cmdpreview_may_show(CommandLineState *s) // Place it there in case preview callback flushes it. #30696 cursorcmd(); // Flush now: external cmdline may itself wish to update the screen which is - // currently disallowed during cmdpreview(no longer needed in case that changes). + // currently disallowed during cmdpreview (no longer needed in case that changes). cmdline_ui_flush(); // Swap invalid command range if needed diff --git a/src/nvim/normal.c b/src/nvim/normal.c index 74f851a097..7d0080622d 100644 --- a/src/nvim/normal.c +++ b/src/nvim/normal.c @@ -97,7 +97,7 @@ typedef struct { bool previous_got_int; // `got_int` was true bool cmdwin; // command-line window normal mode bool noexmode; // true if the normal mode was pushed from - // ex mode(:global or :visual for example) + // ex mode (:global or :visual for example) bool toplevel; // top-level normal mode oparg_T oa; // operator arguments cmdarg_T ca; // command arguments @@ -504,9 +504,9 @@ bool op_pending(void) /// Normal state entry point. This is called on: /// /// - Startup, In this case the function never returns. -/// - The command-line window is opened(`q:`). Returns when `cmdwin_result` != 0. +/// - The command-line window is opened (`q:`). Returns when `cmdwin_result` != 0. /// - The :visual command is called from :global in ex mode, `:global/PAT/visual` -/// for example. Returns when re-entering ex mode(because ex mode recursion is +/// for example. Returns when re-entering ex mode (because ex mode recursion is /// not allowed) /// /// This used to be called main_loop() on main.c @@ -642,8 +642,7 @@ static bool normal_need_redraw_mode_message(NormalState *s) return ( // 'showmode' is set and messages can be printed ((p_smd && msg_silent == 0 - // must restart insert mode(ctrl+o or ctrl+l) or we just entered visual - // mode + // must restart insert mode (ctrl+o or ctrl+l) or just entered visual mode && (restart_edit != 0 || (VIsual_active && s->old_pos.lnum == curwin->w_cursor.lnum && s->old_pos.col == curwin->w_cursor.col)) @@ -6625,8 +6624,8 @@ static void nv_event(cmdarg_T *cap) // `input_get` branch was not executed (!multiqueue_empty(loop.events), which // could have `may_garbage_collect` set to true in `normal_check`). // - // That is because here we may run code that calls `input_get` - // later(`f_confirm` or `get_keystroke` for example), but in these cases it is + // That is because here we may run code that calls `input_get` later + // (`f_confirm` or `get_keystroke` for example), but in these cases it is // not safe to perform garbage collection because there could be unreferenced // lists or dicts being used. may_garbage_collect = false; diff --git a/src/nvim/os/signal.c b/src/nvim/os/signal.c index ecedf144e5..98d13fc9d1 100644 --- a/src/nvim/os/signal.c +++ b/src/nvim/os/signal.c @@ -187,8 +187,7 @@ static void on_signal(SignalWatcher *handle, int signum, void *data) switch (signum) { #ifdef SIGPWR case SIGPWR: - // Signal of a power failure(eg batteries low), flush the swap files to - // be safe + // Signal of a power failure (eg batteries low), flush the swap files to be safe ml_sync_all(false, false, true); break; #endif diff --git a/src/nvim/path.c b/src/nvim/path.c index 08a63eacd0..3df77571a1 100644 --- a/src/nvim/path.c +++ b/src/nvim/path.c @@ -2073,7 +2073,7 @@ char *path_shorten_fname(char *full_path, char *dir_name) /// @param[in] flags Flags passed to expand_wildcards(). /// /// @returns OK when *file is set to allocated array of matches -/// and *num_file(can be zero) to the number of matches. +/// and *num_file (can be zero) to the number of matches. /// If FAIL is returned, *num_file and *file are either /// unchanged or *num_file is set to 0 and *file is set /// to NULL or points to "". |